From: Christian Ehrhardt <christian.ehrhardt@canonical.com> To: stable@dpdk.org, Thomas Monjalon <thomas@monjalon.net>, Luca Boccassi <bluca@debian.org>, Bruce Richardson <bruce.richardson@intel.com> Cc: Pai Sunil <sunil.pai.g@intel.com>, Ilya Maximets <i.maximets@ovn.org>, Stokes Ian <ian.stokes@intel.com>, Govindharajan Hariprasad <hariprasad.govindharajan@intel.com>, James Page <james.page@canonical.com>, Christian Ehrhardt <christian.ehrhardt@canonical.com> Subject: [dpdk-stable] [PATCH 4/7] Revert "Revert "Revert "build/pkg-config: move pkg-config file creation""" Date: Mon, 22 Mar 2021 12:21:32 +0100 Message-ID: <20210322112135.3420072-5-christian.ehrhardt@canonical.com> (raw) In-Reply-To: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> This reverts commit deebf952394cef1d14912f3dc2fc5121431c16a5. 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. --- MAINTAINERS | 2 -- buildtools/pkg-config/meson.build | 22 ---------------------- meson.build | 25 +++++++++++++++++++++++-- 3 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 buildtools/pkg-config/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 952ded7b00..75431e333b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -131,8 +131,6 @@ F: config/rte_config.h F: buildtools/call-sphinx-build.py F: buildtools/gen-pmdinfo-cfile.sh F: buildtools/map_to_def.py -F: buildtools/list-dir-globs.py -F: buildtools/pkg-config/ F: buildtools/symlink-drivers-solibs.sh Public CI diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build deleted file mode 100644 index c93711b5e8..0000000000 --- a/buildtools/pkg-config/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2020 Intel Corporation - -# for static builds, include the drivers as libs and we need to "whole-archive" -# them. -dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] - -pkg = import('pkgconfig') -pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args -if is_freebsd - pkg_extra_cflags += ['-D__BSD_VISIBLE'] -endif -pkg.generate(name: meson.project_name(), - filebase: 'lib' + meson.project_name().to_lower(), - version: meson.project_version(), - libraries: dpdk_libraries, - 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.''', - subdirs: [get_option('include_subdir_arch'), '.'], - extra_cflags: pkg_extra_cflag -) diff --git a/meson.build b/meson.build index 00949de995..58995252bd 100644 --- a/meson.build +++ b/meson.build @@ -64,8 +64,29 @@ configure_file(output: build_cfg, install_dir: join_paths(get_option('includedir'), get_option('include_subdir_arch'))) -# build pkg-config files for dpdk -subdir('buildtools/pkg-config') +# for static builds, include the drivers as libs and we need to "whole-archive" +# them. +dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] + +pkg = import('pkgconfig') +pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args +if is_freebsd + pkg_extra_cflags += ['-D__BSD_VISIBLE'] +endif +pkg.generate(name: meson.project_name(), + filebase: 'lib' + meson.project_name().to_lower(), + version: meson.project_version(), + libraries: dpdk_libraries, + libraries_private: dpdk_drivers + dpdk_static_libraries + + ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, + requires: libbsd, # apps using rte_string_fns.h may need this if enabled + # if libbsd is not enabled, then this is blank + 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.''', + subdirs: [get_option('include_subdir_arch'), '.'], + extra_cflags: pkg_extra_cflags +) # final output, list all the libs and drivers to be built # this does not affect any part of the build, for information only. -- 2.30.0
next prev 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 ` [dpdk-stable] [PATCH 3/7] Revert "Revert "Revert "build/pkg-config: output drivers first for static build""" Christian Ehrhardt 2021-03-22 11:21 ` Christian Ehrhardt [this message] 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 meson.build 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: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210322112135.3420072-5-christian.ehrhardt@canonical.com \ --to=christian.ehrhardt@canonical.com \ --cc=bluca@debian.org \ --cc=bruce.richardson@intel.com \ --cc=hariprasad.govindharajan@intel.com \ --cc=i.maximets@ovn.org \ --cc=ian.stokes@intel.com \ --cc=james.page@canonical.com \ --cc=stable@dpdk.org \ --cc=sunil.pai.g@intel.com \ --cc=thomas@monjalon.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * 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 https://inbox.dpdk.org/stable/0 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/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git