From ef8101560eefd6160df6d4b57ddb65ea2328c441 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 20 Jun 2022 17:08:53 -0700
Subject: [PATCH] meson: Support building Xnest and Xorg on darwin
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
hw/xfree86/meson.build | 2 +-
meson.build | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 29ea315682..c4db85cdb6 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -75,7 +75,7 @@ endif
if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
linker_export_flags = '-Wl,--export-all-symbols'
-elif host_machine.system() == 'sunos'
+elif host_machine.system() == 'sunos' or host_machine.system() == 'darwin'
linker_export_flags = []
else
linker_export_flags = '-Wl,--export-dynamic'
diff --git a/meson.build b/meson.build
index db1d63f3e8..0793f0e540 100644
--- a/meson.build
+++ b/meson.build
@@ -184,8 +184,7 @@ if with_dtrace
endif
build_xorg = false
-if (host_machine.system() != 'darwin' and
- host_machine.system() != 'windows')
+if (host_machine.system() != 'windows')
if get_option('xorg') == 'auto'
build_xorg = (host_machine.system() != 'darwin' and
host_machine.system() != 'windows')
@@ -230,8 +229,7 @@ if (host_machine.system() != 'darwin' and
endif
build_xnest = false
-if (host_machine.system() != 'darwin' and
- host_machine.system() != 'windows')
+if (host_machine.system() != 'windows')
if get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true'
--
GitLab