diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-01-17 09:49:55 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-03-20 16:57:23 +0000 |
| commit | 66f2e7801b7d90173da583f0bd7cf88cbb4f8285 (patch) | |
| tree | 674c5ced13b77ec1f07f1b0882610f37c22a89a7 | |
| parent | 9d1499af33c00a33036a11b772afd4b8642d0659 (diff) | |
meson: fix va target linkage
The state tracker needs to be linked with whole-archive (like
autotools). As a result there are symbols from libswdri and libswkmsdri
that are needed, so link those as well.
v4: - Always add libswdri and libswkmsdri to link_with list
Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 2e4be28fb2a256c423485cc99b1250b2d3c92da6)
| -rw-r--r-- | src/gallium/targets/va/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 1e453c9f760..57d267e5b6e 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/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 @@ -40,9 +40,10 @@ libva_gallium = shared_library( include_directories : [ inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], + link_whole : [libva_st], link_with : [ - libva_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, ], dependencies : [ dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau, |