[RFC,1/5] app: fix missing dependencies

Message ID 20200916164429.244847-2-bruce.richardson@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series rework feature enabling macros for compatibility |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson Sept. 16, 2020, 4:44 p.m. UTC
  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")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-crypto-perf/meson.build |  3 +++
 app/test-pmd/meson.build         | 12 ++++++++++++
 app/test/meson.build             |  3 +++
 3 files changed, 18 insertions(+)
  

Patch

diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index f394b75ba5..4bd71510dc 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -12,3 +12,6 @@  sources = files('cperf_ops.c',
 		'cperf_test_verify.c',
 		'main.c')
 deps += ['cryptodev', 'net', '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 ea56e547bb..ed7dddec7b 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -28,6 +28,18 @@  deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
 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 786a213972..31e3de3724 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -344,6 +344,9 @@  endif
 if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD')
 	test_deps += 'pmd_skeleton_event'
 endif
+if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
+	test_deps += 'pmd_crypto_scheduler'
+endif
 if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')
 	test_sources += 'test_telemetry_json.c'
 	fast_tests += [['telemetry_json_autotest', true]]