[dpdk-stable] patch 'build: provide suitable error for "both" libraries option' has been queued to stable release 19.11.7

[Christian Ehrhardt]

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 <christian.ehrhardt at canonical.com>

---
>From de0465bb593d4c2003be65aa72b51b91c482120c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
Reviewed-by: Andrew Boyer <aboyer at pensando.io>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 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 at 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')