[Mesa-dev] [PATCH 5/6] meson: fix xa target linkage

[Dylan Baker]

This needs to link the state-tracker with whole archive, and needs a few
extra window-system deps.

Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
---
 src/gallium/targets/xa/meson.build | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index 8ff6486..7417a27 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -24,12 +24,20 @@
 
 xa_link_args = []
 xa_link_depends = []
+xa_link_with = []
 
 if with_ld_version_script
   xa_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'xa.sym')]
   xa_link_depends += files('xa.sym')
 endif
 
+if with_dri
+  xa_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+  xa_link_with += libswkmsdri
+endif
+
 libxatracker = shared_library(
   'xatracker',
   'target.c',
@@ -39,14 +47,14 @@ libxatracker = shared_library(
   include_directories : [
     inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
+  link_whole : [libxa_st],
   link_with : [
-    libxa_st, libgalliumvl_stub, libgallium, libmesa_util,
-    libpipe_loader_static, libws_null, libwsw,
+    libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static,
+    libws_null, libwsw, xa_link_with,
   ],
   link_depends : xa_link_depends,
   dependencies : [
-    dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
-    driver_nouveau, driver_i915, driver_svga, driver_freedreno,
+    dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
   ],
   install : true,
 )
-- 
git-series 0.9.1