A few classes meson.build were not expressing dependencies to the associated device library. Define std_deps for baseband, gpu and regex drivers.
Signed-off-by: David Marchand <david.march...@redhat.com> --- drivers/baseband/acc/meson.build | 2 +- drivers/baseband/fpga_5gnr_fec/meson.build | 2 +- drivers/baseband/fpga_lte_fec/meson.build | 2 +- drivers/baseband/la12xx/meson.build | 2 +- drivers/baseband/meson.build | 2 ++ drivers/baseband/null/meson.build | 2 +- drivers/baseband/turbo_sw/meson.build | 2 +- drivers/gpu/cuda/meson.build | 2 +- drivers/gpu/meson.build | 2 ++ drivers/regex/cn9k/meson.build | 2 +- drivers/regex/meson.build | 2 +- drivers/regex/mlx5/meson.build | 2 +- 12 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/baseband/acc/meson.build b/drivers/baseband/acc/meson.build index 966cd65c79..27a654b501 100644 --- a/drivers/baseband/acc/meson.build +++ b/drivers/baseband/acc/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2020 Intel Corporation -deps += ['bbdev', 'bus_pci'] +deps += ['bus_pci'] sources = files('rte_acc100_pmd.c', 'rte_vrb_pmd.c') diff --git a/drivers/baseband/fpga_5gnr_fec/meson.build b/drivers/baseband/fpga_5gnr_fec/meson.build index 745cd271f2..c3678d23eb 100644 --- a/drivers/baseband/fpga_5gnr_fec/meson.build +++ b/drivers/baseband/fpga_5gnr_fec/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2020 Intel Corporation -deps += ['bbdev', 'bus_vdev', 'ring', 'pci', 'bus_pci'] +deps += ['bus_vdev', 'ring', 'pci', 'bus_pci'] sources = files('rte_fpga_5gnr_fec.c') diff --git a/drivers/baseband/fpga_lte_fec/meson.build b/drivers/baseband/fpga_lte_fec/meson.build index e00688da33..14e07826ef 100644 --- a/drivers/baseband/fpga_lte_fec/meson.build +++ b/drivers/baseband/fpga_lte_fec/meson.build @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation -deps += ['bbdev', 'bus_vdev', 'ring', 'pci', 'bus_pci'] +deps += ['bus_vdev', 'ring', 'pci', 'bus_pci'] sources = files('fpga_lte_fec.c') diff --git a/drivers/baseband/la12xx/meson.build b/drivers/baseband/la12xx/meson.build index 7a017dcffa..7b7e41c961 100644 --- a/drivers/baseband/la12xx/meson.build +++ b/drivers/baseband/la12xx/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2020-2021 NXP -deps += ['bbdev', 'bus_vdev', 'ring'] +deps += ['bus_vdev', 'ring'] sources = files('bbdev_la12xx.c') diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build index 1d732da882..3420d98564 100644 --- a/drivers/baseband/meson.build +++ b/drivers/baseband/meson.build @@ -14,4 +14,6 @@ drivers = [ 'turbo_sw', ] +std_deps = [ 'bbdev' ] + log_prefix = 'pmd.bb' diff --git a/drivers/baseband/null/meson.build b/drivers/baseband/null/meson.build index 02ef7db573..22863f0bd8 100644 --- a/drivers/baseband/null/meson.build +++ b/drivers/baseband/null/meson.build @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi <bl...@debian.org> -deps += ['bbdev', 'bus_vdev', 'ring'] +deps += ['bus_vdev', 'ring'] sources = files('bbdev_null.c') diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build index aeb9a76f9e..a9035a753e 100644 --- a/drivers/baseband/turbo_sw/meson.build +++ b/drivers/baseband/turbo_sw/meson.build @@ -26,5 +26,5 @@ if dep_dec5g.found() cflags += ['-DRTE_BBDEV_SDK_AVX512'] endif -deps += ['bbdev', 'bus_vdev', 'ring'] +deps += ['bus_vdev', 'ring'] sources = files('bbdev_turbo_software.c') diff --git a/drivers/gpu/cuda/meson.build b/drivers/gpu/cuda/meson.build index 784fa8bf0d..d54473f148 100644 --- a/drivers/gpu/cuda/meson.build +++ b/drivers/gpu/cuda/meson.build @@ -21,5 +21,5 @@ if cc.has_header('gdrapi.h') dpdk_conf.set('DRIVERS_GPU_CUDA_GDRCOPY_H', 1) endif -deps += ['gpudev', 'pci', 'bus_pci'] +deps += ['pci', 'bus_pci'] sources = files('cuda.c', 'gdrcopy.c') diff --git a/drivers/gpu/meson.build b/drivers/gpu/meson.build index 601bedcd61..b6edd12678 100644 --- a/drivers/gpu/meson.build +++ b/drivers/gpu/meson.build @@ -2,3 +2,5 @@ # Copyright (c) 2021 NVIDIA Corporation & Affiliates drivers = [ 'cuda' ] + +std_deps = [ 'gpudev' ] diff --git a/drivers/regex/cn9k/meson.build b/drivers/regex/cn9k/meson.build index 44b12b9845..b22275928a 100644 --- a/drivers/regex/cn9k/meson.build +++ b/drivers/regex/cn9k/meson.build @@ -12,5 +12,5 @@ sources = files( 'cn9k_regexdev.c', ) -deps += ['bus_pci', 'regexdev'] +deps += ['bus_pci'] deps += ['common_cnxk', 'mempool_cnxk'] diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build index 7ad55af8ca..ff2a8fea89 100644 --- a/drivers/regex/meson.build +++ b/drivers/regex/meson.build @@ -5,4 +5,4 @@ drivers = [ 'mlx5', 'cn9k', ] -std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc +std_deps = ['ethdev', 'kvargs', 'regexdev'] # 'ethdev' also pulls in mbuf, net, eal etc diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build index 0f4ca46f44..6070b37501 100644 --- a/drivers/regex/mlx5/meson.build +++ b/drivers/regex/mlx5/meson.build @@ -7,7 +7,7 @@ if not is_linux subdir_done() endif -deps += ['common_mlx5', 'eal', 'regexdev'] +deps += ['common_mlx5', 'eal'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() -- 2.41.0