frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2018-08-07 16:23:13 -07:00 committed by Adam Jackson
parent 9869512cbf
commit db53c439ba
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/os-support/meson.build
View File

@ -100,8 +100,16 @@ elif host_machine.system().endswith('bsd')
if host_machine.cpu_family() == 'x86_64' if host_machine.cpu_family() == 'x86_64'
srcs_xorg_os_support += 'bsd/i386_video.c' 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' elif host_machine.cpu_family() == 'x86'
srcs_xorg_os_support += 'bsd/i386_video.c' 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' elif host_machine.cpu_family() == 'arm'
srcs_xorg_os_support += 'bsd/arm_video.c' srcs_xorg_os_support += 'bsd/arm_video.c'
elif host_machine.cpu_family() == 'powerpc' elif host_machine.cpu_family() == 'powerpc'

2
include/meson.build
View File

@ -343,12 +343,10 @@ if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
xorg_data.set('USE_DEV_IO', true) xorg_data.set('USE_DEV_IO', true)
endif endif
elif host_machine.system() == 'netbsd' elif host_machine.system() == 'netbsd'
# XXX: Add link to libi386
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
xorg_data.set('USE_I386_IOPL', true) xorg_data.set('USE_I386_IOPL', true)
endif endif
elif host_machine.system() == 'openbsd' elif host_machine.system() == 'openbsd'
# XXX: Add link to libi386, libamd64
if host_machine.cpu_family() == 'x86' if host_machine.cpu_family() == 'x86'
xorg_data.set('USE_I386_IOPL', true) xorg_data.set('USE_I386_IOPL', true)
endif endif