[dpdk-stable] patch 'app: fix missing dependencies' 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 10/30/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 93d49d3ce1a43a87f600228e5d66d3f391cb4051 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 15 Oct 2020 16:05:47 +0100
Subject: [PATCH] app: fix missing dependencies

[ upstream commit fac83b3ef8accd5f0f4da5b9a60d047e448281f8 ]

A number of lib and driver dependencies for various apps were missed on
build because the proper macro names for their use were mismatched between
meson and make build systems. Before adding in equivalent compatibility
macros we need to ensure to add the proper dependencies to ensure a valid
build.

Fixes: 16ade738fd0d ("app/testpmd: build with meson")
Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")
Fixes: 996ef1176111 ("app: add all remaining apps to meson build")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 app/test-crypto-perf/meson.build |  3 +++
 app/test-pmd/meson.build         | 12 ++++++++++++
 app/test/meson.build             |  1 +
 3 files changed, 16 insertions(+)

diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 0674396da8..c416091fdd 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -13,3 +13,6 @@ sources = files('cperf_ops.c',
 		'cperf_test_verify.c',
 		'main.c')
 deps += ['cryptodev', 'security']
+if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
+	deps += 'pmd_crypto_scheduler'
+endif
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 93235c8192..5d77314df7 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -31,6 +31,18 @@ endif
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
 endif
+if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS')
+	deps += 'bitratestats'
+endif
+if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS')
+	deps += 'latencystats'
+endif
+if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
+	deps += 'pmd_crypto_scheduler'
+endif
+if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
+	deps += 'pmd_bond'
+endif
 if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
 	deps += 'pmd_bnxt'
 endif
diff --git a/app/test/meson.build b/app/test/meson.build
index 12668fa454..1fa9124c7e 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -380,6 +380,7 @@ endif
 
 if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
 	driver_test_names += 'cryptodev_scheduler_autotest'
+	test_deps += 'pmd_crypto_scheduler'
 endif
 
 foreach d:test_deps
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.916405482 +0000
+++ 0201-app-fix-missing-dependencies.patch	2020-10-28 10:35:11.808834498 +0000
@@ -1,8 +1,10 @@
-From fac83b3ef8accd5f0f4da5b9a60d047e448281f8 Mon Sep 17 00:00:00 2001
+From 93d49d3ce1a43a87f600228e5d66d3f391cb4051 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Thu, 15 Oct 2020 16:05:47 +0100
 Subject: [PATCH] app: fix missing dependencies
 
+[ upstream commit fac83b3ef8accd5f0f4da5b9a60d047e448281f8 ]
+
 A number of lib and driver dependencies for various apps were missed on
 build because the proper macro names for their use were mismatched between
 meson and make build systems. Before adding in equivalent compatibility
@@ -12,7 +14,6 @@
 Fixes: 16ade738fd0d ("app/testpmd: build with meson")
 Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")
 Fixes: 996ef1176111 ("app: add all remaining apps to meson build")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Luca Boccassi <bluca at debian.org>
@@ -23,18 +24,18 @@
  3 files changed, 16 insertions(+)
 
 diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
-index f394b75ba5..4bd71510dc 100644
+index 0674396da8..c416091fdd 100644
 --- a/app/test-crypto-perf/meson.build
 +++ b/app/test-crypto-perf/meson.build
-@@ -12,3 +12,6 @@ sources = files('cperf_ops.c',
+@@ -13,3 +13,6 @@ sources = files('cperf_ops.c',
  		'cperf_test_verify.c',
  		'main.c')
- deps += ['cryptodev', 'net', 'security']
+ deps += ['cryptodev', 'security']
 +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
 +	deps += 'pmd_crypto_scheduler'
 +endif
 diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
-index f52ab148f6..0d9e450494 100644
+index 93235c8192..5d77314df7 100644
 --- a/app/test-pmd/meson.build
 +++ b/app/test-pmd/meson.build
 @@ -31,6 +31,18 @@ endif
@@ -57,10 +58,10 @@
  	deps += 'pmd_bnxt'
  endif
 diff --git a/app/test/meson.build b/app/test/meson.build
-index dedf29dd7f..fc90a1909f 100644
+index 12668fa454..1fa9124c7e 100644
 --- a/app/test/meson.build
 +++ b/app/test/meson.build
-@@ -415,6 +415,7 @@ endif
+@@ -380,6 +380,7 @@ endif
  
  if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
  	driver_test_names += 'cryptodev_scheduler_autotest'