[dpdk-stable] patch 'app: fix missing dependencies' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/24/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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2a2c760d38bd601078214f490180dc4e2fb57d11

Thanks.

Kevin.

---
>From 2a2c760d38bd601078214f490180dc4e2fb57d11 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 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index d735b186f9..e3c5faf56f 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -14,2 +14,5 @@ sources = files('cperf_ops.c',
 		'main.c')
 deps += ['cryptodev']
+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 adeeeeedba..39acefb445 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -34,4 +34,16 @@ 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'
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.607132568 +0000
+++ 0035-app-fix-missing-dependencies.patch	2020-11-18 16:33:37.935215066 +0000
@@ -1 +1 @@
-From fac83b3ef8accd5f0f4da5b9a60d047e448281f8 Mon Sep 17 00:00:00 2001
+From 2a2c760d38bd601078214f490180dc4e2fb57d11 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fac83b3ef8accd5f0f4da5b9a60d047e448281f8 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -22,2 +23 @@
- app/test/meson.build             |  1 +
- 3 files changed, 16 insertions(+)
+ 2 files changed, 15 insertions(+)
@@ -26 +26 @@
-index f394b75ba5..4bd71510dc 100644
+index d735b186f9..e3c5faf56f 100644
@@ -29 +29 @@
-@@ -13,2 +13,5 @@ sources = files('cperf_ops.c',
+@@ -14,2 +14,5 @@ sources = files('cperf_ops.c',
@@ -31 +31 @@
- deps += ['cryptodev', 'net', 'security']
+ deps += ['cryptodev']
@@ -36 +36 @@
-index f52ab148f6..0d9e450494 100644
+index adeeeeedba..39acefb445 100644
@@ -39 +39 @@
-@@ -32,4 +32,16 @@ if dpdk_conf.has('RTE_LIBRTE_PDUMP')
+@@ -34,4 +34,16 @@ if dpdk_conf.has('RTE_LIBRTE_PDUMP')
@@ -56,10 +55,0 @@
-diff --git a/app/test/meson.build b/app/test/meson.build
-index dedf29dd7f..fc90a1909f 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -416,4 +416,5 @@ endif
- if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
- 	driver_test_names += 'cryptodev_scheduler_autotest'
-+	test_deps += 'pmd_crypto_scheduler'
- endif
-