[Mesa-dev] [PATCH v3 7/9] meson: Fix omx-bellagio target linkage

[Dylan Baker]

This needs to use --whole-archive (link_whole in meson) to properly
expose symbols.

Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker")
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
---
 src/gallium/targets/omx-bellagio/meson.build | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/omx-bellagio/meson.build b/src/gallium/targets/omx-bellagio/meson.build
index c9e8eb8..75f0f02 100644
--- a/src/gallium/targets/omx-bellagio/meson.build
+++ b/src/gallium/targets/omx-bellagio/meson.build
@@ -24,6 +24,14 @@
 
 omx_link_args = []
 omx_link_depends = []
+omx_link_with = []
+
+if with_dri
+  omx_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+  omx_link_with += libswkmsdri
+endif
 
 if with_ld_version_script
   omx_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'omx.sym')]
@@ -39,9 +47,10 @@ libomx_gallium = shared_library(
   include_directories : [
     inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
+  link_whole : [libomx_st],
   link_with : [
-    libomx_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
-    libpipe_loader_static, libws_null, libwsw,
+    libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+    libpipe_loader_static, libws_null, libwsw, omx_link_with,
   ],
   link_depends : omx_link_depends,
   dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau],
-- 
git-series 0.9.1