diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-23 16:28:42 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-23 16:28:42 -0700 |
| commit | 6036e845271800b2e268f5cba9283ce07a7fad3a (patch) | |
| tree | 10f7e1ee342d4d1f4e5c530ffc05cfd62c27e87b | |
| parent | 0e8c0d2f238e5d50daaf4672bd80ad519673b5e3 (diff) | |
meson: fix builds on Solaris 11.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | hw/xfree86/meson.build | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/meson.build | 4 | ||||
| -rw-r--r-- | include/meson.build | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build index c80964ea4..8b657acf0 100644 --- a/hw/xfree86/meson.build +++ b/hw/xfree86/meson.build @@ -75,6 +75,8 @@ endif if host_machine.system() == 'cygwin' or host_machine.system() == 'windows' linker_export_flags = '-Wl,--export-all-symbols' +elif host_machine.system() == 'sunos' + linker_export_flags = [] else linker_export_flags = '-Wl,--export-dynamic' endif diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build index 484a118e7..6e426665a 100644 --- a/hw/xfree86/os-support/meson.build +++ b/hw/xfree86/os-support/meson.build @@ -16,7 +16,7 @@ os_c_args = [] if get_option('pciaccess') srcs_xorg_os_support += 'bus/Pci.c' - if host_machine.system() != 'linux' and host_machine.system() != 'solaris' + if host_machine.system() != 'linux' srcs_xorg_os_support += 'bus/bsd_pci.c' endif if host_machine.cpu() == 'sparc' @@ -60,7 +60,7 @@ if host_machine.system() == 'linux' srcs_xorg_os_support += 'shared/pm_noop.c' endif -elif host_machine.system() == 'solaris' +elif host_machine.system() == 'sunos' srcs_xorg_os_support += [ 'solaris/sun_apm.c', 'solaris/sun_bell.c', diff --git a/include/meson.build b/include/meson.build index bb89493e1..661624a01 100644 --- a/include/meson.build +++ b/include/meson.build @@ -124,7 +124,6 @@ conf_data.set('HAVE_LINUX_AGPGART_H', cc.has_header('linux/agpgart.h')) conf_data.set('HAVE_STDLIB_H', cc.has_header('stdlib.h')) conf_data.set('HAVE_STRING_H', cc.has_header('string.h')) conf_data.set('HAVE_STRINGS_H', cc.has_header('strings.h')) -conf_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h')) conf_data.set('HAVE_SYS_AGPGART_H', cc.has_header('sys/agpgart.h')) conf_data.set('HAVE_SYS_AGPIO_H', cc.has_header('sys/agpio.h')) conf_data.set('HAVE_SYS_UTSNAME_H', cc.has_header('sys/utsname.h')) @@ -358,6 +357,9 @@ xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess')) xorg_data.set_quoted('PCI_TXT_IDS_PATH', '') xorg_data.set('XSERVER_PLATFORM_BUS', build_udev) xorg_data.set('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd') +xorg_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h')) +xorg_data.set('HAVE_SYS_KD_H', cc.has_header('sys/kd.h')) +xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h')) if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd' if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' |