[dpdk-stable] [PATCH 1/7] Revert "Revert "Revert "build/pkg-config: prevent overlinking"""

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon Mar 22 12:21:29 CET 2021


This reverts commit f49248a990b5c34938c5246e013bc82f1296959f.
This series changes linking behavior in 19.11.x and thereby should stay
out. It breaks - for example - a rebuild of OVS 2.13 or builds
of later OVS 2.13.x stable releases.
---
 buildtools/pkg-config/meson.build | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
index 39a8fd1c8e..63a76b56d3 100644
--- a/buildtools/pkg-config/meson.build
+++ b/buildtools/pkg-config/meson.build
@@ -21,11 +21,6 @@ endif
 # Another requirement is to allow linking dependencies as shared libraries,
 # while linking static DPDK libraries and drivers. It is satisfied by
 # listing the static files in Libs.private with the explicit syntax -l:libfoo.a.
-# As a consequence, the regular DPDK libraries are already listed as static
-# in the field Libs.private. The second occurences of DPDK libraries,
-# included from Requires and used for shared library linkage case,
-# are skipped in the case of static linkage thanks to the flag --as-needed.
-
 
 pkg.generate(name: 'dpdk-libs',
 	filebase: 'libdpdk-libs',
@@ -34,7 +29,7 @@ Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
 	version: meson.project_version(),
 	subdirs: [get_option('include_subdir_arch'), '.'],
 	extra_cflags: pkg_extra_cflags,
-	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
+	libraries: dpdk_libraries,
 	libraries_private: dpdk_extra_ldflags)
 
 platform_flags = []
-- 
2.30.0



More information about the stable mailing list