d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: always link whole DPDK static libraries

Browse Source 
To ensure all constructors are included in static build, we need to pass
the --whole-archive flag when linking, which is used with the
"link_whole" meson option. Since we use link_whole for all libs, we no
longer need to track the lib as part of the static dependency, just the
path to the headers for compiling.

After this patch is applied, all DPDK .a files are inside
--whole-archive/--no-whole-archive flags, but external dependencies and
shared libs being linked against remain outside.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Andrzej Ostruszka <aostruszka@marvell.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Sunil Pai G <sunil.pai.g@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Bruce Richardson 2020-06-30 15:14:27 +01:00 committed by Thomas Monjalon
parent 949c97ae31
commit e2db26f766
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/test/meson.build
View File

@ -417,7 +417,7 @@ test_dep_objs += cc.find_library('execinfo', required: false)
link_libs = []
link_nodes = []
if get_option('default_library') == 'static'
link_libs = dpdk_drivers
link_libs = dpdk_static_libraries + dpdk_drivers
link_nodes = dpdk_graph_nodes
endif

2
drivers/meson.build
View File

@ -200,7 +200,7 @@ foreach class:dpdk_driver_classes
shared_dep = declare_dependency(link_with: shared_lib,
include_directories: includes,
dependencies: shared_deps)
static_dep = declare_dependency(link_with: static_lib,
static_dep = declare_dependency(
include_directories: includes,
dependencies: static_deps)

6
examples/meson.build
View File

@ -1,10 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
driver_libs = []
link_whole_libs = []
node_libs = []
if get_option('default_library') == 'static'
driver_libs = dpdk_drivers
link_whole_libs = dpdk_static_libraries + dpdk_drivers
node_libs = dpdk_graph_nodes
endif
@ -101,7 +101,7 @@ foreach example: examples
endif
executable('dpdk-' + name, sources,
include_directories: includes,
link_whole: driver_libs + node_libs,
link_whole: link_whole_libs + node_libs,
link_args: dpdk_extra_ldflags,
c_args: cflags,
dependencies: dep_objs)

2
lib/meson.build
View File

@ -134,7 +134,7 @@ foreach l:libraries
dependencies: static_deps,
include_directories: includes,
install: true)
static_dep = declare_dependency(link_with: static_lib,
static_dep = declare_dependency(
include_directories: includes,
dependencies: static_deps)