This list contains a list of *static* driver libraries. Reflect that in its name.
Signed-off-by: Robin Jarry <[email protected]> Acked-by: Bruce Richardson <[email protected]> --- app/meson.build | 2 +- buildtools/pkg-config/meson.build | 2 +- buildtools/subproject/meson.build | 2 +- drivers/meson.build | 2 +- examples/meson.build | 2 +- meson.build | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/meson.build b/app/meson.build index 24fadc19631e..ad2d29d1d7a5 100644 --- a/app/meson.build +++ b/app/meson.build @@ -108,7 +108,7 @@ foreach app:apps dpdk_apps_enabled += app link_libs = [] if get_option('default_library') == 'static' - link_libs = dpdk_static_libraries + dpdk_drivers + link_libs = dpdk_static_libraries + dpdk_static_drivers endif exec = executable('dpdk-' + name, diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build index a0a265ad92c7..14ea3097c461 100644 --- a/buildtools/pkg-config/meson.build +++ b/buildtools/pkg-config/meson.build @@ -49,7 +49,7 @@ Note that CFLAGS might contain an -march flag higher than typical baseline. This is required for a number of static inline functions in the public headers.''', requires: ['libdpdk-libs'], libraries_private: ['-Wl,--whole-archive'] + - dpdk_drivers + dpdk_static_libraries + + dpdk_static_drivers + dpdk_static_libraries + ['-Wl,--no-whole-archive'] + platform_flags ) diff --git a/buildtools/subproject/meson.build b/buildtools/subproject/meson.build index 8ae081e1698a..57022f07be7c 100644 --- a/buildtools/subproject/meson.build +++ b/buildtools/subproject/meson.build @@ -13,7 +13,7 @@ if get_option('default_library') == 'static' compile_args: subproject_cflags, # static library deps in DPDK build don't include "link_with" parameters, # so explicitly link-in both libs and drivers - link_whole: dpdk_static_libraries + dpdk_drivers, + link_whole: dpdk_static_libraries + dpdk_static_drivers, link_args: dpdk_extra_ldflags) else dpdk_dep = declare_dependency( diff --git a/drivers/meson.build b/drivers/meson.build index 102a8262e588..7146f036c4c9 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -404,7 +404,7 @@ foreach subpath:subdirs include_directories: includes, dependencies: static_deps) - dpdk_drivers += static_lib + dpdk_static_drivers += static_lib set_variable('shared_@0@'.format(lib_name), shared_dep) set_variable('static_@0@'.format(lib_name), static_dep) diff --git a/examples/meson.build b/examples/meson.build index 544ec5eadd82..4c142a010d48 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -3,7 +3,7 @@ link_whole_libs = [] if get_option('default_library') == 'static' - link_whole_libs = dpdk_static_libraries + dpdk_drivers + link_whole_libs = dpdk_static_libraries + dpdk_static_drivers endif # list of all example apps. Keep 1-3 per line, in alphabetical order. diff --git a/meson.build b/meson.build index 6b8cfa8b2e90..554ba33e9c66 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,7 @@ dpdk_headers = [] dpdk_indirect_headers = [] dpdk_drivers_headers = [] dpdk_driver_classes = [] -dpdk_drivers = [] +dpdk_static_drivers = [] dpdk_extra_ldflags = [] dpdk_libs_deprecated = [] dpdk_apps_disabled = [] -- 2.56.0
