patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Christian Ehrhardt <>
To:, Thomas Monjalon <>,
	Luca Boccassi <>,
	Bruce Richardson <>
Cc: Pai Sunil <>,
	Ilya Maximets <>,
	Stokes Ian <>,
	Govindharajan Hariprasad <>,
	James Page <>,
	Christian Ehrhardt <>
Subject: [dpdk-stable] [PATCH 3/7] Revert "Revert "Revert "build/pkg-config: output drivers first for static build"""
Date: Mon, 22 Mar 2021 12:21:31 +0100
Message-ID: <> (raw)
In-Reply-To: <>

This reverts commit 906e935a1fd1f6cf01ff12d70c2f040aa91984c6.
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.

Reverting this drops the two following 19.11.7 changes which need to be
re-created in the new (old) place of
 buildtools/pkg-config/ | 36 ++++---------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/buildtools/pkg-config/ b/buildtools/pkg-config/
index ccb34dcab3..c93711b5e8 100644
--- a/buildtools/pkg-config/
+++ b/buildtools/pkg-config/
@@ -10,41 +10,13 @@ pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
 if is_freebsd
 	pkg_extra_cflags += ['-D__BSD_VISIBLE']
-# When calling pkg-config --static --libs, pkg-config will always output the
-# regular libs first, and then the extra libs from Libs.private field,
-# since the assumption is that those are additional dependencies for building
-# statically that the .a files depend upon. The output order of .pc fields is:
-#   Libs   Libs.private   Requires   Requires.private
-# The fields Requires* are for package names.
-# The flags of the DPDK libraries must be defined in Libs* fields.
-# However, the DPDK drivers are linked only in static builds (Libs.private),
-# and those need to come *before* the regular libraries (Libs field).
-# This requirement is satisfied by moving the regular libs in a separate file
-# included in the field Requires (after Libs.private).
-pkg.generate(name: 'dpdk-libs',
-	filebase: 'libdpdk-libs',
-	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
-Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
+pkg.generate(name: meson.project_name(),
+	filebase: 'lib' + meson.project_name().to_lower(),
 	version: meson.project_version(),
-	subdirs: [get_option('include_subdir_arch'), '.'],
-	extra_cflags: pkg_extra_cflags,
 	libraries: dpdk_libraries,
-	libraries_private: dpdk_extra_ldflags)
-platform_flags = []
-if not is_windows
-	platform_flags += ['-Wl,--export-dynamic'] # ELF only
-pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
-	filebase: 'libdpdk',
-	version: meson.project_version(),
 	description: '''The Data Plane Development Kit (DPDK).
 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', libbsd], # may need libbsd for string funcs
-	                  # if libbsd is not enabled, then this is blank
-	libraries_private: dpdk_drivers + dpdk_static_libraries +
-			['-Wl,-Bdynamic'] + platform_flags
+	subdirs: [get_option('include_subdir_arch'), '.'],
+	extra_cflags: pkg_extra_cflag

  parent reply	other threads:[~2021-03-22 11:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-22 11:21 [dpdk-stable] [PATCH 0/7] Do not change build/link behavior on stable release Christian Ehrhardt
2021-03-22 11:21 ` [dpdk-stable] [PATCH 1/7] Revert "Revert "Revert "build/pkg-config: prevent overlinking""" Christian Ehrhardt
2021-03-22 11:21 ` [dpdk-stable] [PATCH 2/7] Revert "Revert "Revert "build/pkg-config: improve static linking flags""" Christian Ehrhardt
2021-03-22 11:21 ` Christian Ehrhardt [this message]
2021-03-22 11:21 ` [dpdk-stable] [PATCH 4/7] Revert "Revert "Revert "build/pkg-config: move pkg-config file creation""" Christian Ehrhardt
2021-03-22 11:21 ` [dpdk-stable] [PATCH 5/7] Revert "Revert "Revert "build: always link whole DPDK static libraries""" Christian Ehrhardt
2021-03-22 11:21 ` [dpdk-stable] [PATCH 6/7] Revert "Revert "Revert "devtools: test static linkage with pkg-config""" Christian Ehrhardt
2021-03-22 11:21 ` [dpdk-stable] [PATCH 7/7] Regenerate changes required due to reverts Christian Ehrhardt
2021-03-22 12:00 ` [dpdk-stable] [PATCH 0/7] Do not change build/link behavior on stable release Luca Boccassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ \
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:

AGPL code for this site: git clone