net/txgbe: add L2 tunnel filter init and uninit

[dpdk.git] / buildtools / pkg-config / meson.build

diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
index dacc5db..39a8fd1 100644 (file)
--- a/buildtools/pkg-config/meson.build
+++ b/buildtools/pkg-config/meson.build
@@ -21,6 +21,11 @@ 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',
@@ -29,9 +34,13 @@ 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: dpdk_libraries,
+       libraries: ['-Wl,--as-needed'] + dpdk_libraries,
        libraries_private: dpdk_extra_ldflags)
 
+platform_flags = []
+if not is_windows
+       platform_flags += ['-Wl,--export-dynamic'] # ELF only
+endif
 pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
        filebase: 'libdpdk',
        version: meson.project_version(),
@@ -42,7 +51,7 @@ This is required for a number of static inline functions in the public headers.'
                          # if libbsd is not enabled, then this is blank
        libraries_private: ['-Wl,--whole-archive'] +
                        dpdk_drivers + dpdk_static_libraries +
-                       ['-Wl,--no-whole-archive']
+                       ['-Wl,--no-whole-archive'] + platform_flags
 )
 
 # For static linking with dependencies as shared libraries,