[PATCH xserver 04/10] meson: Add linking to x86 iopl libs on BSDs.

[Eric Anholt]

Ported from automake.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 hw/xfree86/os-support/meson.build | 8 ++++++++
 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 49b138ed2dab..65418b74a743 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 43139fa97d15..43d70d59440e 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
-- 
2.18.0