[dpdk-stable] patch 'net/octeontx: fix meson build for disabled drivers' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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

Thanks.

Luca Boccassi

---
>From 272fcab0633393e8f7fa608c3046aa98ad73c9a4 Mon Sep 17 00:00:00 2001
From: Amit Gupta <agupta3 at marvell.com>
Date: Wed, 4 Mar 2020 11:17:04 +0530
Subject: [PATCH] net/octeontx: fix meson build for disabled drivers

[ upstream commit be284df0829254f5b84bb965acbecef0aa2ae043 ]

Add a condition to check if octeontx drivers are disabled.
octeontx drivers are built only if dependent drivers i.e.
ethdev, mempool and common/octeontx are enabled.

Bugzilla ID: 387
Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")

Signed-off-by: Amit Gupta <agupta3 at marvell.com>
Reviewed-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Harman Kalra <hkalra at marvell.com>
---
 drivers/net/octeontx/base/meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index a06a2c89c9..e1060fc4ec 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -10,7 +10,10 @@ sources = [
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	static_objs += [get_variable('static_rte_' + d)]
+	if not is_variable('shared_rte_' + d)
+		subdir_done()
+	endif
+	static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:46.086685211 +0100
+++ 0037-net-octeontx-fix-meson-build-for-disabled-drivers.patch	2020-05-19 14:04:44.172647575 +0100
@@ -1,15 +1,16 @@
-From be284df0829254f5b84bb965acbecef0aa2ae043 Mon Sep 17 00:00:00 2001
+From 272fcab0633393e8f7fa608c3046aa98ad73c9a4 Mon Sep 17 00:00:00 2001
 From: Amit Gupta <agupta3 at marvell.com>
 Date: Wed, 4 Mar 2020 11:17:04 +0530
 Subject: [PATCH] net/octeontx: fix meson build for disabled drivers
 
+[ upstream commit be284df0829254f5b84bb965acbecef0aa2ae043 ]
+
 Add a condition to check if octeontx drivers are disabled.
 octeontx drivers are built only if dependent drivers i.e.
 ethdev, mempool and common/octeontx are enabled.
 
 Bugzilla ID: 387
 Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Amit Gupta <agupta3 at marvell.com>
 Reviewed-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -19,7 +20,7 @@
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
-index b72104170e..b8fe4b3013 100644
+index a06a2c89c9..e1060fc4ec 100644
 --- a/drivers/net/octeontx/base/meson.build
 +++ b/drivers/net/octeontx/base/meson.build
 @@ -10,7 +10,10 @@ sources = [