Skip to contentSkip to conversation

meson: link static libs with whole-archive in subproject

PATCH Applied Robin Jarry 4 participants 4 messages Jan 29, 2024 – Feb 18, 2024 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: link static libs with whole-archive in subproject

When DPDK is used as a subproject, declare static libs to be linked with -Wl,--whole-archive along with the drivers. This is already done this way in pkg-config.

Fixes f93a605f2d6e ("build: add definitions for use as Meson subproject")
---
 buildtools/subproject/meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
buildtools/subproject/meson.build +1 -2
index 985ce76a9384..aa28f5fae152 100644
@@ -8,8 +8,7 @@ if get_option('default_library') == 'static'
             dependencies: dpdk_static_lib_deps,
             # static library deps in DPDK build don't include "link_with" parameters,
             # so explicitly link-in both libs and drivers
-            link_with: dpdk_static_libraries,
-            link_whole: dpdk_drivers,
+            link_whole: dpdk_static_libraries + dpdk_drivers,
             link_args: dpdk_extra_ldflags)
 else
     dpdk_dep = declare_dependency(
Signature · 1 line
2.43.0
#2 lore raw
Quoted 6 lines · David Marchand
Quoted 5 lines · Robin Jarry

When DPDK is used as a subproject, declare static libs to be linked with -Wl,--whole-archive along with the drivers. This is already done this way in pkg-config.

Quoted 6 lines
Quoted 4 lines
Fixes f93a605f2d6e ("build: add definitions for use as Meson subproject")
#3 lore raw

29/01/2024 14:17, Bruce Richardson:

Quoted 7 lines · David Marchand
Quoted 6 lines · Robin Jarry
Quoted 5 lines

When DPDK is used as a subproject, declare static libs to be linked with -Wl,--whole-archive along with the drivers. This is already done this way in pkg-config.

Quoted 6 lines
Quoted 5 lines
Quoted 4 lines
Fixes f93a605f2d6e ("build: add definitions for use as Meson subproject")

Applied, thanks.