From 91a59b628745a1f77b446c85ab6163a50ebe2e55 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Jan 2018 10:12:19 -0800 Subject: [PATCH] meson: Fix omx-bellagio target linkage This needs to use --whole-archive (link_whole in meson) to properly expose symbols. v4: - Always add libswdri and libswkmsdri to link_with Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/targets/omx-bellagio/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/targets/omx-bellagio/meson.build b/src/gallium/targets/omx-bellagio/meson.build index c9e8eb8fa56..6811e6ff904 100644 --- a/src/gallium/targets/omx-bellagio/meson.build +++ b/src/gallium/targets/omx-bellagio/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -39,9 +39,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, libswdri, libswkmsdri, ], link_depends : omx_link_depends, dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau], -- 2.30.2