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 7/7] Regenerate meson.build changes required due to reverts Date: Mon, 22 Mar 2021 12:21:35 +0100 Message-ID: <20210322112135.3420072-8-christian.ehrhardt@canonical.com> (raw) In-Reply-To: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> Due to a series of re-re-reverts by this case: http://mails.dpdk.org/archives/stable/2021-March/029418.html http://mails.dpdk.org/archives/stable/2020-September/024796.html The two changes of: 3f33f5056 build: fix plugin load on static build 4a2baf099 build: fix linker flags on Windows would have been lost. Re-apply them here to have the reverts only remove what was added by them. Fixes: 16ade738fd0d ("app/testpmd: build with meson") Fixes: 89f0711f9ddf ("examples: build some samples with meson") Fixes: b031e13d7f0d ("build: fix plugin load on static build") Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 58995252bd..01bbb556ec 100644 --- a/meson.build +++ b/meson.build @@ -64,9 +64,14 @@ configure_file(output: build_cfg, install_dir: join_paths(get_option('includedir'), get_option('include_subdir_arch'))) +platform_flags = [] +if not is_windows + platform_flags += ['-Wl,--export-dynamic'] # ELF only +endif + # 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'] +dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] + platform_flags pkg = import('pkgconfig') pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args -- 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 ` [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 ` Christian Ehrhardt [this message] 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-8-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