From 0b73c329bc024d94d85d4e0bf5e95cd8be635eb2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Jan 2018 10:12:19 -0800 Subject: [PATCH] meson: Fix xa 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 list Fixes: 0ba909f0f111824 ("meson: build gallium xa state tracker") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/targets/xa/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index 75808cd0a83..ea6e1296dae 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/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 @@ -30,6 +30,7 @@ if with_ld_version_script xa_link_depends += files('xa.sym') endif + libxatracker = shared_library( 'xatracker', 'target.c', @@ -39,9 +40,10 @@ 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, libswdri, libswkmsdri, ], link_depends : xa_link_depends, dependencies : [ -- 2.30.2