From 033d93a021e86dd5ce9b2b3a1554a72c7031a7f2 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia 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 (cherry picked from commit ef8101560eefd6160df6d4b57ddb65ea2328c441) --- 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 29ea31568..c4db85cdb 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 9ea7e1d76..64d82fe23 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') @@ -197,8 +196,7 @@ xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg') libxcvt_dep = dependency('libxcvt', required: build_xorg) 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'