[dpdk-stable] patch 'devtools: fix build test config inheritance from env' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/20. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/4c3e7055205a0c7dd873b82e2dfa7b33555f69d0

Thanks.

Luca Boccassi

---
>From 4c3e7055205a0c7dd873b82e2dfa7b33555f69d0 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 9 Nov 2020 22:00:08 +0100
Subject: [PATCH] devtools: fix build test config inheritance from env

[ upstream commit a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 ]

The variables DPDK_MESON_OPTIONS, PATH, PKG_CONFIG_PATH,
CPPFLAGS, CFLAGS and LDFLAGS can be customized in the config file
loaded by devtools/load-devel-config at each build.
The configuration can be adjusted per target thanks to the value set
in the DPDK_TARGET variable.

PKG_CONFIG_PATH is specific to each target, so it must be empty
before configuring each build from the file according to DPDK_TARGET.
Inheriting a default PKG_CONFIG_PATH for all targets does not make sense
and is prone to confusion.

DPDK_MESON_OPTIONS might take a global initial value from environment
to customize a build test from the shell. Example:
	DPDK_MESON_OPTIONS="b_lto=true"
Some target-specific options can be added in the configuration file:
	DPDK_MESON_OPTIONS="$DPDK_MESON_OPTIONS kernel_dir=$MYKERNEL"

Fixes: 272236741258 ("devtools: load target-specific compilation environment")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
Tested-by: Jerin Jacob <jerinj at marvell.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 devtools/test-meson-builds.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index a76811e79f..0971fe59c4 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -38,20 +38,21 @@ else
 fi
 
 default_path=$PATH
-default_pkgpath=$PKG_CONFIG_PATH
 default_cppflags=$CPPFLAGS
 default_cflags=$CFLAGS
 default_ldflags=$LDFLAGS
+default_meson_options=$DPDK_MESON_OPTIONS
 
 load_env () # <target compiler>
 {
 	targetcc=$1
+	# reset variables before target-specific config
 	export PATH=$default_path
-	export PKG_CONFIG_PATH=$default_pkgpath
+	unset PKG_CONFIG_PATH # global default makes no sense
 	export CPPFLAGS=$default_cppflags
 	export CFLAGS=$default_cflags
 	export LDFLAGS=$default_ldflags
-	unset DPDK_MESON_OPTIONS
+	export DPDK_MESON_OPTIONS=$default_meson_options
 	command -v $targetcc >/dev/null 2>&1 || return 1
 	DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
 	. $srcdir/devtools/load-devel-config
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.024420700 +0000
+++ 0001-devtools-fix-build-test-config-inheritance-from-env.patch	2020-11-17 11:13:12.857115320 +0000
@@ -1 +1 @@
-From a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 Mon Sep 17 00:00:00 2001
+From 4c3e7055205a0c7dd873b82e2dfa7b33555f69d0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 ]
+
@@ -24 +25,0 @@
-Cc: stable at dpdk.org
@@ -32,2 +33,2 @@
- devtools/test-meson-builds.sh | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ devtools/test-meson-builds.sh | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
@@ -36 +37 @@
-index 0c95d1cc98..f32b5784f4 100755
+index a76811e79f..0971fe59c4 100755
@@ -39 +40 @@
-@@ -38,10 +38,10 @@ else
+@@ -38,20 +38,21 @@ else
@@ -49,3 +49,0 @@
- check_cc_flags () # <flag to check> <flag2> ...
- {
-@@ -52,12 +52,14 @@ check_cc_flags () # <flag to check> <flag2> ...
@@ -64,4 +62,3 @@
-+	# set target hint for use in the loaded config file
- 	if [ -n "$target_override" ] ; then
- 		DPDK_TARGET=$target_override
- 	elif command -v $targetcc >/dev/null 2>&1 ; then
+ 	command -v $targetcc >/dev/null 2>&1 || return 1
+ 	DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
+ 	. $srcdir/devtools/load-devel-config