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 5EFB8A0524 for ; Thu, 4 Feb 2021 12:36:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5474E24075E; Thu, 4 Feb 2021 12:36:30 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id B62FD240736 for ; Thu, 4 Feb 2021 12:36:28 +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 1l7cvx-0005U5-3E; Thu, 04 Feb 2021 11:36:25 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: Andrew Boyer , Honnappa Nagarahalli , Thomas Monjalon , dpdk stable Date: Thu, 4 Feb 2021 12:28:50 +0100 Message-Id: <20210204112954.2488123-75-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: provide suitable error for "both" libraries option' has been queued to stable release 19.11.7 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" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/de0465bb593d4c2003be65aa72b51b91c482120c Thanks. Christian Ehrhardt --- >From de0465bb593d4c2003be65aa72b51b91c482120c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 11 Jan 2021 13:55:59 +0000 Subject: [PATCH] build: provide suitable error for "both" libraries option [ upstream commit 08895f10e7729c07ccd063501acd04e77c7730f5 ] Rather than having the DPDK configuration error out when linking apps and examples when "both" is select for "default_library" option, we can detect that setting earlier in the build config and provide a suitable error message to the user. Signed-off-by: Bruce Richardson Reviewed-by: Andrew Boyer Reviewed-by: Honnappa Nagarahalli Acked-by: Thomas Monjalon --- config/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/meson.build b/config/meson.build index bab00f1489..9847746a72 100644 --- a/config/meson.build +++ b/config/meson.build @@ -280,3 +280,12 @@ if get_option('b_lto') add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c') endif endif + +if get_option('default_library') == 'both' + error( ''' + Unsupported value "both" for "default_library" option. + + NOTE: DPDK always builds both shared and static libraries. Please set + "default_library" to either "static" or "shared" to select default linkage + for apps and any examples.''') +endif -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.192788529 +0100 +++ 0075-build-provide-suitable-error-for-both-libraries-opti.patch 2021-02-04 12:04:28.074789772 +0100 @@ -1 +1 @@ -From 08895f10e7729c07ccd063501acd04e77c7730f5 Mon Sep 17 00:00:00 2001 +From de0465bb593d4c2003be65aa72b51b91c482120c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 08895f10e7729c07ccd063501acd04e77c7730f5 ] + @@ -11,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -22 +22 @@ -index 1e6dfe0753..9abb30c39f 100644 +index bab00f1489..9847746a72 100644 @@ -25 +25 @@ -@@ -330,3 +330,12 @@ if get_option('b_lto') +@@ -280,3 +280,12 @@ if get_option('b_lto')