diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-07 16:23:13 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 13:28:21 -0400 |
| commit | db53c439ba785a16f789918fe66da6ba161a0742 (patch) | |
| tree | 79e5e3cf53b5b17410d7cd20c94bf4f60d8f3560 | |
| parent | 9869512cbf1bd87146f59106c0c71bda76cc0dcc (diff) | |
meson: Add linking to x86 iopl libs on BSDs.
Ported from automake.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/os-support/meson.build | 8 | ||||
| -rw-r--r-- | include/meson.build | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build index 49b138ed2..65418b74a 100644 --- a/hw/xfree86/os-support/meson.build +++ b/hw/xfree86/os-support/meson.build @@ -100,8 +100,16 @@ elif host_machine.system().endswith('bsd') if host_machine.cpu_family() == 'x86_64' srcs_xorg_os_support += 'bsd/i386_video.c' + if host_machine.system() == 'netbsd' + os_dep += cc.find_library('x86_64') + elif host_machine.system() == 'openbsd' + os_dep += cc.find_library('amd64') + endif elif host_machine.cpu_family() == 'x86' srcs_xorg_os_support += 'bsd/i386_video.c' + if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' + os_dep += cc.find_library('i386') + endif elif host_machine.cpu_family() == 'arm' srcs_xorg_os_support += 'bsd/arm_video.c' elif host_machine.cpu_family() == 'powerpc' diff --git a/include/meson.build b/include/meson.build index 43139fa97..43d70d594 100644 --- a/include/meson.build +++ b/include/meson.build @@ -343,12 +343,10 @@ if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd' xorg_data.set('USE_DEV_IO', true) endif elif host_machine.system() == 'netbsd' - # XXX: Add link to libi386 if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' xorg_data.set('USE_I386_IOPL', true) endif elif host_machine.system() == 'openbsd' - # XXX: Add link to libi386, libamd64 if host_machine.cpu_family() == 'x86' xorg_data.set('USE_I386_IOPL', true) endif |