From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9990EA0562 for ; Mon, 22 Mar 2021 12:21:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 911CB4069C; Mon, 22 Mar 2021 12:21:53 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 566BA4003D for ; Mon, 22 Mar 2021 12:21:52 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lOId6-0001ak-4F; Mon, 22 Mar 2021 11:21:52 +0000 From: Christian Ehrhardt To: stable@dpdk.org, Thomas Monjalon , Luca Boccassi , Bruce Richardson Cc: Pai Sunil , Ilya Maximets , Stokes Ian , Govindharajan Hariprasad , James Page , Christian Ehrhardt Date: Mon, 22 Mar 2021 12:21:35 +0100 Message-Id: <20210322112135.3420072-8-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> References: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 7/7] Regenerate meson.build changes required due to reverts X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- 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