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 5/7] Revert "Revert "Revert "build: always link whole DPDK static libraries""" Date: Mon, 22 Mar 2021 12:21:33 +0100 Message-ID: <20210322112135.3420072-6-christian.ehrhardt@canonical.com> (raw) In-Reply-To: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> This reverts commit a3bd9a34bf9988de641b6e78b825fafb69d2d13f. 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. --- app/test/meson.build | 2 +- drivers/meson.build | 2 +- examples/meson.build | 6 +++--- lib/meson.build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 24fb59f74f..860728bb07 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -391,7 +391,7 @@ test_dep_objs += cc.find_library('execinfo', required: false) link_libs = [] if get_option('default_library') == 'static' - link_libs = dpdk_static_libraries + dpdk_drivers + link_libs = dpdk_drivers endif dpdk_test = executable('dpdk-test', diff --git a/drivers/meson.build b/drivers/meson.build index 696079680b..0400d84675 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -198,7 +198,7 @@ foreach class:dpdk_driver_classes shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes, dependencies: shared_deps) - static_dep = declare_dependency( + static_dep = declare_dependency(link_with: static_lib, include_directories: includes, dependencies: static_deps) diff --git a/examples/meson.build b/examples/meson.build index 9e081f3fb7..4dc292fbd1 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -link_whole_libs = [] +driver_libs = [] if get_option('default_library') == 'static' - link_whole_libs = dpdk_static_libraries + dpdk_drivers + driver_libs = dpdk_drivers endif execinfo = cc.find_library('execinfo', required: false) @@ -97,7 +97,7 @@ foreach example: examples endif executable('dpdk-' + name, sources, include_directories: includes, - link_whole: link_whole_libs, + link_whole: driver_libs, link_args: ldflags, c_args: cflags, dependencies: dep_objs) diff --git a/lib/meson.build b/lib/meson.build index b60396428c..f8da4f3168 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -127,7 +127,7 @@ foreach l:libraries dependencies: static_deps, include_directories: includes, install: true) - static_dep = declare_dependency( + static_dep = declare_dependency(link_with: static_lib, include_directories: includes, dependencies: static_deps) -- 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 ` [dpdk-stable] [PATCH 4/7] Revert "Revert "Revert "build/pkg-config: move pkg-config file creation""" Christian Ehrhardt 2021-03-22 11:21 ` Christian Ehrhardt [this message] 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-6-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