build: remove custom dependency checks in drivers

Some drivers currently have their own checks and give some non
consistent reasons when an internal dependency is unavailable.

drivers/meson.build also checks for internal dependencies via 'deps'.
Let's rely on it for consistency, and smaller code.

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Long Li <longli@microsoft.com>

diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index c0751aeb59744097d7b93a55c14aea291a04aa90..2acc989694264cde993c4015a5928e373e8c4a15 100644 (file)
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -7,8 +7,5 @@ if is_windows
     subdir_done()
 endif
 
-# this driver can be built if-and-only-if KNI library is buildable
-build = dpdk_conf.has('RTE_LIB_KNI')
-reason = 'missing dependency, DPDK KNI library'
-sources = files('rte_eth_kni.c')
 deps += 'kni'
+sources = files('rte_eth_kni.c')

diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index f74b941f65d9a31896ac39b53371dfa0e036a631..399400dd011499babe5ddc65a920eda31da8e991 100644 (file)
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -7,8 +7,7 @@ if is_windows
     subdir_done()
 endif
 
-build = dpdk_conf.has('RTE_BUS_VMBUS')
-reason = 'missing dependency, DPDK VMBus driver'
+deps += 'bus_vmbus'
 sources = files(
         'hn_ethdev.c',
         'hn_nvs.c',
@@ -17,4 +16,3 @@ sources = files(
         'hn_vf.c',
 )
 
-deps += ['bus_vmbus' ]

diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 858b79fdf580b104a161bd8a885157a536c8c507..f481a3a4b836105f9e22ef001f005aa7c39bf7da 100644 (file)
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -7,8 +7,6 @@ if is_windows
     subdir_done()
 endif
 
-build = dpdk_conf.has('RTE_LIB_VHOST')
-reason = 'missing dependency, DPDK vhost library'
+deps += 'vhost'
 sources = files('rte_eth_vhost.c')
 headers = files('rte_eth_vhost.h')
-deps += 'vhost'

diff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build
index 8824f887ce6d519fa48d4f2c851b656dbf228172..3b1d3371b22e2a9882868aa2bf6addc740a3ca04 100644 (file)
--- a/drivers/raw/dpaa2_cmdif/meson.build
+++ b/drivers/raw/dpaa2_cmdif/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
-build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')
-reason = 'missing dependency, DPDK DPAA2 mempool driver'
 deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev']
 sources = files('dpaa2_cmdif.c')
 

diff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build
index 0c9ae0d8dc631bef0bb298f49f94660a897e3ad2..4639073bcf51a2e2eff2b7f709ce3c322f7636f1 100644 (file)
--- a/drivers/raw/dpaa2_qdma/meson.build
+++ b/drivers/raw/dpaa2_qdma/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
-build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')
-reason = 'missing dependency, DPDK DPAA2 mempool driver'
 deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs']
 sources = files('dpaa2_qdma.c')
 

diff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build
index 9d256af4b91af57be59fd556075b343cbec4e8be..f78d36a7156e3b0a4467225f1008cb16f7101408 100644 (file)
--- a/drivers/vdpa/ifc/meson.build
+++ b/drivers/vdpa/ifc/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-build = dpdk_conf.has('RTE_LIB_VHOST')
-reason = 'missing dependency, DPDK vhost library'
+deps += 'vhost'
 sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')
 includes += include_directories('base')
-deps += 'vhost'