From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14D3F4571A; Fri, 2 Aug 2024 14:44:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F9B342E85; Fri, 2 Aug 2024 14:44:37 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by mails.dpdk.org (Postfix) with ESMTP id A61EE42E74 for ; Fri, 2 Aug 2024 14:44:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722602675; x=1754138675; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1cNJUKDQIAsdNHSF+ICqDJfX/vabFTyAjCe4aqTil9U=; b=MwGqKhnf9kiEkh/PfVGrK5jE9YBQe+cYEW4MzYaM9QiRCmyhifKTeu5j 2ZS0aAGxAxl1I/7sIY0iTxSX+W69BLMvFKxMPe0DikB2GnlRZVX6XjPXM GKbSVGBKaxhyhu2T3fwi3mMGHaADxyonMsPQQLb8dQg09oDzzkK+TB61K x8VfybPpCWAef2ScFnZejjst4wtqObystvu6AogEnRUw0TDzVNbfbQz6q C+K62h/WHe7rAHRXR+eMY7EWAGOjp19FWCISxEHNoQJJhFyDSPm21dW/E ojJkBF7m6pfxZWrGuVCq6qXCKQ+m11Zw7UXiTZuGzTRzU3fL+YoqjE9wE A==; X-CSE-ConnectionGUID: aZTrCYRDSo6Hk9PxWhvDrg== X-CSE-MsgGUID: 4DsGJCTSS966ipnIeuIUzw== X-IronPort-AV: E=McAfee;i="6700,10204,11152"; a="20499788" X-IronPort-AV: E=Sophos;i="6.09,257,1716274800"; d="scan'208";a="20499788" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2024 05:44:34 -0700 X-CSE-ConnectionGUID: WeWD7JTkRsmYpFqzJsm8pg== X-CSE-MsgGUID: ZgzfeJADTh2LUbbj+m8vRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,257,1716274800"; d="scan'208";a="56149911" Received: from silpixa00401385.ir.intel.com ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 02 Aug 2024 05:44:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, konstantin.ananyev@huawei.com, anatoly.burakov@intel.com, Bruce Richardson Subject: [PATCH v2 5/7] build: reduce driver dependencies Date: Fri, 2 Aug 2024 13:44:09 +0100 Message-ID: <20240802124411.485430-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240802124411.485430-1-bruce.richardson@intel.com> References: <20240730145508.551075-1-bruce.richardson@intel.com> <20240802124411.485430-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove any unnecessary dependencies from the driver dependency lists. This will give each driver a near-minimum set of required dependencies. Signed-off-by: Bruce Richardson --- drivers/baseband/fpga_5gnr_fec/meson.build | 2 +- drivers/baseband/fpga_lte_fec/meson.build | 2 +- drivers/baseband/la12xx/meson.build | 2 +- drivers/baseband/null/meson.build | 2 +- drivers/baseband/turbo_sw/meson.build | 2 +- drivers/bus/auxiliary/meson.build | 2 -- drivers/bus/dpaa/meson.build | 2 +- drivers/bus/fslmc/meson.build | 2 +- drivers/bus/ifpga/meson.build | 2 +- drivers/bus/pci/meson.build | 4 +--- drivers/bus/platform/meson.build | 1 - drivers/bus/uacce/meson.build | 2 -- drivers/bus/vdev/meson.build | 2 -- drivers/common/cnxk/meson.build | 4 ++-- drivers/common/cpt/meson.build | 2 +- drivers/common/idpf/meson.build | 2 +- drivers/common/mlx5/meson.build | 2 +- drivers/compress/mlx5/meson.build | 2 +- drivers/compress/nitrox/meson.build | 2 +- drivers/compress/octeontx/meson.build | 2 +- drivers/crypto/bcmfs/meson.build | 2 +- drivers/crypto/cnxk/meson.build | 2 +- drivers/crypto/dpaa_sec/meson.build | 2 +- drivers/crypto/ipsec_mb/meson.build | 2 +- drivers/crypto/mlx5/meson.build | 2 +- drivers/crypto/nitrox/meson.build | 2 +- drivers/dma/cnxk/meson.build | 2 +- drivers/dma/dpaa/meson.build | 2 +- drivers/dma/dpaa2/meson.build | 2 +- drivers/dma/odm/meson.build | 2 +- drivers/dma/skeleton/meson.build | 2 +- drivers/event/cnxk/meson.build | 2 +- drivers/event/dlb2/meson.build | 2 +- drivers/event/dpaa2/meson.build | 2 +- drivers/event/octeontx/meson.build | 3 +-- drivers/event/sw/meson.build | 2 +- drivers/mempool/cnxk/meson.build | 2 +- drivers/mempool/dpaa/meson.build | 2 +- drivers/mempool/dpaa2/meson.build | 2 +- drivers/mempool/octeontx/meson.build | 2 +- drivers/net/cnxk/meson.build | 3 +-- drivers/net/iavf/meson.build | 2 +- drivers/net/ice/meson.build | 2 +- drivers/net/mana/meson.build | 2 +- drivers/net/mlx5/meson.build | 2 +- drivers/net/sfc/meson.build | 2 +- drivers/net/softnic/meson.build | 2 +- drivers/raw/cnxk_bphy/meson.build | 2 +- drivers/raw/cnxk_gpio/meson.build | 2 +- drivers/raw/ntb/meson.build | 2 +- drivers/raw/skeleton/meson.build | 2 +- drivers/regex/mlx5/meson.build | 2 +- drivers/vdpa/ifc/meson.build | 2 +- drivers/vdpa/meson.build | 3 +-- drivers/vdpa/mlx5/meson.build | 2 +- drivers/vdpa/sfc/meson.build | 2 +- 56 files changed, 53 insertions(+), 65 deletions(-) diff --git a/drivers/baseband/fpga_5gnr_fec/meson.build b/drivers/baseband/fpga_5gnr_fec/meson.build index c3678d23eb..31b9e92fbb 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 += ['bus_vdev', 'ring', 'pci', 'bus_pci'] +deps += ['bus_vdev', '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 14e07826ef..fbf24755db 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 += ['bus_vdev', 'ring', 'pci', 'bus_pci'] +deps += ['bus_vdev', 'bus_pci'] sources = files('fpga_lte_fec.c') diff --git a/drivers/baseband/la12xx/meson.build b/drivers/baseband/la12xx/meson.build index 7b7e41c961..e1dbdd0fa7 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 += ['bus_vdev', 'ring'] +deps += ['bus_vdev'] sources = files('bbdev_la12xx.c') diff --git a/drivers/baseband/null/meson.build b/drivers/baseband/null/meson.build index 22863f0bd8..716d6c6fdb 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 -deps += ['bus_vdev', 'ring'] +deps += ['bus_vdev'] sources = files('bbdev_null.c') diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build index a9035a753e..ac18e8a9b6 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 += ['bus_vdev', 'ring'] +deps += ['bus_vdev'] sources = files('bbdev_turbo_software.c') diff --git a/drivers/bus/auxiliary/meson.build b/drivers/bus/auxiliary/meson.build index 10468fd130..a113f11743 100644 --- a/drivers/bus/auxiliary/meson.build +++ b/drivers/bus/auxiliary/meson.build @@ -13,5 +13,3 @@ if is_linux endif require_iova_in_mbuf = false - -deps += ['kvargs'] diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build index 114e0a2265..d0ae5a9ff0 100644 --- a/drivers/bus/dpaa/meson.build +++ b/drivers/bus/dpaa/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['common_dpaax', 'eventdev'] +deps = ['common_dpaax', 'eventdev'] sources = files( 'base/fman/fman.c', 'base/fman/fman_hw.c', diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build index 162ca286fe..989a47c7a0 100644 --- a/drivers/bus/fslmc/meson.build +++ b/drivers/bus/fslmc/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['common_dpaax', 'eventdev', 'kvargs'] +deps = ['common_dpaax', 'eventdev'] sources = files( 'fslmc_bus.c', 'fslmc_vfio.c', diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build index dedc94db2d..e87b08eaf4 100644 --- a/drivers/bus/ifpga/meson.build +++ b/drivers/bus/ifpga/meson.build @@ -7,6 +7,6 @@ if is_windows subdir_done() endif -deps += ['pci', 'kvargs', 'rawdev'] +deps = ['pci', 'rawdev'] driver_sdk_headers += files('bus_ifpga_driver.h') sources = files('ifpga_bus.c') diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build index fede114dc7..776c3d1550 100644 --- a/drivers/bus/pci/meson.build +++ b/drivers/bus/pci/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -deps += ['pci'] +deps = ['pci'] headers = files('rte_bus_pci.h') driver_sdk_headers = files('bus_pci_driver.h') sources = files('pci_common.c', @@ -31,5 +31,3 @@ if is_windows endif require_iova_in_mbuf = false - -deps += ['kvargs'] diff --git a/drivers/bus/platform/meson.build b/drivers/bus/platform/meson.build index 8633cc4e75..2039c23ac6 100644 --- a/drivers/bus/platform/meson.build +++ b/drivers/bus/platform/meson.build @@ -10,7 +10,6 @@ endif require_iova_in_mbuf = false -deps += ['kvargs'] sources = files( 'platform_params.c', 'platform.c', diff --git a/drivers/bus/uacce/meson.build b/drivers/bus/uacce/meson.build index a659d65f23..130148a315 100644 --- a/drivers/bus/uacce/meson.build +++ b/drivers/bus/uacce/meson.build @@ -8,5 +8,3 @@ endif sources = files('uacce.c') driver_sdk_headers += files('bus_uacce_driver.h') - -deps += ['kvargs'] diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build index 50f0c8918d..24993c88a3 100644 --- a/drivers/bus/vdev/meson.build +++ b/drivers/bus/vdev/meson.build @@ -9,5 +9,3 @@ headers = files('rte_bus_vdev.h') driver_sdk_headers = files('bus_vdev_driver.h') require_iova_in_mbuf = false - -deps += ['kvargs'] diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build index e0e4600989..8ff080ee19 100644 --- a/drivers/common/cnxk/meson.build +++ b/drivers/common/cnxk/meson.build @@ -8,7 +8,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') subdir_done() endif -deps = ['eal', 'pci', 'bus_pci', 'mbuf', 'security'] +deps = ['bus_pci', 'security'] sources = files( 'roc_ae.c', 'roc_aes.c', @@ -91,7 +91,7 @@ sources += files('cnxk_telemetry_bphy.c', 'cnxk_telemetry_sso.c', ) -deps += ['bus_pci', 'net', 'telemetry'] +deps += ['bus_pci'] require_iova_in_mbuf = false diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build index c09824a651..a4b000dc37 100644 --- a/drivers/common/cpt/meson.build +++ b/drivers/common/cpt/meson.build @@ -9,5 +9,5 @@ endif sources = files('cpt_fpm_tables.c', 'cpt_pmd_ops_helper.c') -deps = ['kvargs', 'pci', 'cryptodev'] +deps = ['pci', 'cryptodev'] includes += include_directories('../../crypto/octeontx') diff --git a/drivers/common/idpf/meson.build b/drivers/common/idpf/meson.build index 80c8906f80..adf5430487 100644 --- a/drivers/common/idpf/meson.build +++ b/drivers/common/idpf/meson.build @@ -7,7 +7,7 @@ endif includes += include_directories('../iavf') -deps += ['mbuf'] +deps = ['mbuf'] sources = files( 'idpf_common_device.c', diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 1eefc02f06..b94c956495 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -12,7 +12,7 @@ if is_windows and not is_ms_linker and not meson.is_cross_build() subdir_done() endif -deps += ['hash', 'pci', 'bus_pci', 'bus_auxiliary', 'net', 'eal', 'kvargs'] +deps += ['hash', 'bus_pci', 'bus_auxiliary'] sources += files( 'mlx5_devx_cmds.c', 'mlx5_common.c', diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build index 26a0e0cd09..ddb9e0f82c 100644 --- a/drivers/compress/mlx5/meson.build +++ b/drivers/compress/mlx5/meson.build @@ -7,7 +7,7 @@ if not is_linux subdir_done() endif -deps += ['common_mlx5', 'eal', 'compressdev'] +deps += ['common_mlx5', 'compressdev'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() diff --git a/drivers/compress/nitrox/meson.build b/drivers/compress/nitrox/meson.build index 1becc66912..c3db4ac2bb 100644 --- a/drivers/compress/nitrox/meson.build +++ b/drivers/compress/nitrox/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['common_nitrox', 'bus_pci', 'compressdev'] +deps += ['common_nitrox', 'compressdev'] sources += files( 'nitrox_comp.c', diff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build index 16f973f4d7..0ccde449e8 100644 --- a/drivers/compress/octeontx/meson.build +++ b/drivers/compress/octeontx/meson.build @@ -9,7 +9,7 @@ endif sources = files('otx_zip.c', 'otx_zip_pmd.c') includes += include_directories('include') -deps += ['mempool_octeontx', 'bus_pci'] +deps += ['mempool_octeontx'] ext_deps += dep require_iova_in_mbuf = false diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build index 5842f83a3b..678bab7398 100644 --- a/drivers/crypto/bcmfs/meson.build +++ b/drivers/crypto/bcmfs/meson.build @@ -9,7 +9,7 @@ if is_windows subdir_done() endif -deps += ['eal', 'bus_vdev'] +deps += ['bus_vdev'] sources = files( 'bcmfs_logs.c', 'bcmfs_device.c', diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build index aa840fb7bb..c5a5725e1a 100644 --- a/drivers/crypto/cnxk/meson.build +++ b/drivers/crypto/cnxk/meson.build @@ -25,7 +25,7 @@ sources = files( ) headers = files('rte_pmd_cnxk_crypto.h') -deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev'] +deps += ['common_cnxk', 'eventdev'] includes += include_directories('../../../lib/net', '../../event/cnxk') if get_option('buildtype').contains('debug') diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build index f87ad6c7e7..9efac952c4 100644 --- a/drivers/crypto/dpaa_sec/meson.build +++ b/drivers/crypto/dpaa_sec/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['bus_dpaa', 'mempool_dpaa', 'security'] +deps += ['mempool_dpaa', 'security'] sources = files('dpaa_sec.c', 'dpaa_sec_raw_dp.c') includes += include_directories('../../bus/dpaa/include') diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build index 87bf965554..739cbd1b6e 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -45,5 +45,5 @@ sources = files( 'pmd_snow3g.c', 'pmd_zuc.c', ) -deps += ['bus_vdev', 'net', 'security'] +deps += ['bus_vdev', 'security'] require_iova_in_mbuf = false diff --git a/drivers/crypto/mlx5/meson.build b/drivers/crypto/mlx5/meson.build index d7bc8ec967..595053d8cd 100644 --- a/drivers/crypto/mlx5/meson.build +++ b/drivers/crypto/mlx5/meson.build @@ -7,7 +7,7 @@ if not (is_linux or is_windows) subdir_done() endif -deps += ['common_mlx5', 'eal', 'cryptodev'] +deps += ['common_mlx5', 'cryptodev'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build index f8887713d2..85e3ca2b28 100644 --- a/drivers/crypto/nitrox/meson.build +++ b/drivers/crypto/nitrox/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['common_nitrox', 'bus_pci', 'cryptodev'] +deps += ['common_nitrox', 'cryptodev'] sources += files( 'nitrox_sym.c', diff --git a/drivers/dma/cnxk/meson.build b/drivers/dma/cnxk/meson.build index 8ccc1c2cb7..738774d542 100644 --- a/drivers/dma/cnxk/meson.build +++ b/drivers/dma/cnxk/meson.build @@ -12,7 +12,7 @@ driver_sdk_headers = files( 'cnxk_dma_event_dp.h', ) -deps += ['bus_pci', 'common_cnxk', 'dmadev', 'eventdev'] +deps += ['common_cnxk', 'eventdev'] includes += include_directories('../../event/cnxk') diff --git a/drivers/dma/dpaa/meson.build b/drivers/dma/dpaa/meson.build index c31a6d91fe..fec4a45767 100644 --- a/drivers/dma/dpaa/meson.build +++ b/drivers/dma/dpaa/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on linux' endif -deps += ['dmadev', 'bus_dpaa'] +deps += ['bus_dpaa'] sources = files('dpaa_qdma.c') if cc.has_argument('-Wno-pointer-arith') diff --git a/drivers/dma/dpaa2/meson.build b/drivers/dma/dpaa2/meson.build index a99151e2a5..2b5b76ec5f 100644 --- a/drivers/dma/dpaa2/meson.build +++ b/drivers/dma/dpaa2/meson.build @@ -8,7 +8,7 @@ endif build = dpdk_conf.has('RTE_MEMPOOL_DPAA2') reason = 'missing dependency, DPDK DPAA2 mempool driver' -deps += ['dmadev', 'bus_fslmc', 'mempool_dpaa2', 'ring', 'kvargs'] +deps += ['mempool_dpaa2'] sources = files('dpaa2_qdma.c') if cc.has_argument('-Wno-pointer-arith') diff --git a/drivers/dma/odm/meson.build b/drivers/dma/odm/meson.build index d597762d37..959e7e685d 100644 --- a/drivers/dma/odm/meson.build +++ b/drivers/dma/odm/meson.build @@ -7,7 +7,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') subdir_done() endif -deps += ['bus_pci', 'dmadev', 'eal', 'mempool', 'pci'] +deps += ['bus_pci', 'dmadev', 'mempool'] sources = files('odm_dmadev.c', 'odm.c') diff --git a/drivers/dma/skeleton/meson.build b/drivers/dma/skeleton/meson.build index 77055683ad..0d703a36eb 100644 --- a/drivers/dma/skeleton/meson.build +++ b/drivers/dma/skeleton/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2021 HiSilicon Limited -deps += ['dmadev', 'kvargs', 'ring', 'bus_vdev'] +deps += ['dmadev', 'ring', 'bus_vdev'] sources = files( 'skeleton_dmadev.c', ) diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build index e0e350570d..b365fff0cb 100644 --- a/drivers/event/cnxk/meson.build +++ b/drivers/event/cnxk/meson.build @@ -337,7 +337,7 @@ foreach flag: extra_flags endforeach headers = files('rte_pmd_cnxk_eventdev.h') -deps += ['bus_pci', 'common_cnxk', 'net_cnxk', 'crypto_cnxk', 'dma_cnxk'] +deps += ['net_cnxk', 'crypto_cnxk', 'dma_cnxk'] require_iova_in_mbuf = false diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build index 515d1795fe..217abc174d 100644 --- a/drivers/event/dlb2/meson.build +++ b/drivers/event/dlb2/meson.build @@ -67,4 +67,4 @@ endif headers = files('rte_pmd_dlb2.h') -deps += ['mbuf', 'mempool', 'ring', 'pci', 'bus_pci'] +deps += ['bus_pci'] diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build index dd5063af43..7dae1da32b 100644 --- a/drivers/event/dpaa2/meson.build +++ b/drivers/event/dpaa2/meson.build @@ -5,7 +5,7 @@ if not is_linux build = false reason = 'only supported on Linux' endif -deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec'] +deps += ['net_dpaa2', 'crypto_dpaa2_sec'] sources = files( 'dpaa2_hw_dpcon.c', 'dpaa2_eventdev.c', diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build index eb17e059d8..1227b2e18d 100644 --- a/drivers/event/octeontx/meson.build +++ b/drivers/event/octeontx/meson.build @@ -17,5 +17,4 @@ sources = files( 'timvf_probe.c', ) -deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx'] -deps += ['crypto_octeontx'] +deps = ['net_octeontx', 'crypto_octeontx'] diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build index 3a3ebd72a3..450969aa7a 100644 --- a/drivers/event/sw/meson.build +++ b/drivers/event/sw/meson.build @@ -8,5 +8,5 @@ sources = files( 'sw_evdev_xstats.c', 'sw_evdev.c', ) -deps += ['hash', 'bus_vdev'] +deps += ['bus_vdev'] require_iova_in_mbuf = false diff --git a/drivers/mempool/cnxk/meson.build b/drivers/mempool/cnxk/meson.build index e388cce26a..7bbed325df 100644 --- a/drivers/mempool/cnxk/meson.build +++ b/drivers/mempool/cnxk/meson.build @@ -18,5 +18,5 @@ sources = files( ) headers = files('rte_pmd_cnxk_mempool.h') -deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_cnxk', 'mempool'] +deps = ['common_cnxk'] require_iova_in_mbuf = false diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build index c4e9994b83..39fc312344 100644 --- a/drivers/mempool/dpaa/meson.build +++ b/drivers/mempool/dpaa/meson.build @@ -6,5 +6,5 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['bus_dpaa'] +deps = ['bus_dpaa'] sources = files('dpaa_mempool.c') diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build index 3d16d44158..0099b20b97 100644 --- a/drivers/mempool/dpaa2/meson.build +++ b/drivers/mempool/dpaa2/meson.build @@ -6,7 +6,7 @@ if not is_linux reason = 'only supported on Linux' endif -deps += ['bus_fslmc'] +deps = ['bus_fslmc'] sources = files('dpaa2_hw_mempool.c') headers = files('rte_dpaa2_mempool.h') diff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build index 3ccecac75d..f97bcf4a5a 100644 --- a/drivers/mempool/octeontx/meson.build +++ b/drivers/mempool/octeontx/meson.build @@ -12,6 +12,6 @@ sources = files( 'rte_mempool_octeontx.c', ) -deps += ['mbuf', 'bus_pci', 'common_octeontx'] +deps = ['mbuf', 'bus_pci', 'common_octeontx'] require_iova_in_mbuf = false diff --git a/drivers/net/cnxk/meson.build b/drivers/net/cnxk/meson.build index 7bce80098a..f2f8f60f83 100644 --- a/drivers/net/cnxk/meson.build +++ b/drivers/net/cnxk/meson.build @@ -231,8 +231,7 @@ sources += files( endif endif -deps += ['bus_pci', 'cryptodev', 'eventdev', 'security'] -deps += ['common_cnxk', 'mempool_cnxk'] +deps = ['eventdev', 'mempool_cnxk'] # Allow implicit vector conversions and strict aliasing warning extra_flags = ['-flax-vector-conversions', '-Wno-strict-aliasing'] diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build index 83aebd5596..a96d9c0bc0 100644 --- a/drivers/net/iavf/meson.build +++ b/drivers/net/iavf/meson.build @@ -11,7 +11,7 @@ includes += include_directories('../../common/iavf') testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['common_iavf', 'security'] sources = files( 'iavf_ethdev.c', diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build index b7f2188e62..99344211cb 100644 --- a/drivers/net/ice/meson.build +++ b/drivers/net/ice/meson.build @@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'common_iavf'] includes += include_directories('base', '../../common/iavf') if arch_subdir == 'x86' diff --git a/drivers/net/mana/meson.build b/drivers/net/mana/meson.build index 2d72eca5a8..c97f117fd7 100644 --- a/drivers/net/mana/meson.build +++ b/drivers/net/mana/meson.build @@ -7,7 +7,7 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86') subdir_done() endif -deps += ['pci', 'bus_pci', 'net', 'eal', 'kvargs'] +deps += ['bus_pci'] sources += files( 'gdma.c', diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index b279ddf47c..ec679d11ab 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -8,7 +8,7 @@ if not (is_linux or is_windows) subdir_done() endif -deps += ['hash', 'common_mlx5'] +deps += ['common_mlx5'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index 5adde68517..820ee6c91e 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -71,7 +71,7 @@ if not cc.links(atomic_check_code) ext_deps += libatomic_dep endif -deps += ['common_sfc_efx', 'bus_pci', 'hash'] +deps += ['common_sfc_efx', 'hash'] sources = files( 'sfc_ethdev.c', 'sfc_kvargs.c', diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build index 5dfbd16c77..1529ef38f9 100644 --- a/drivers/net/softnic/meson.build +++ b/drivers/net/softnic/meson.build @@ -15,4 +15,4 @@ sources = files( 'rte_eth_softnic_swq.c', 'rte_eth_softnic_thread.c', ) -deps += ['pipeline', 'port', 'table'] +deps += ['pipeline'] diff --git a/drivers/raw/cnxk_bphy/meson.build b/drivers/raw/cnxk_bphy/meson.build index bb5d2ffb80..b38b071697 100644 --- a/drivers/raw/cnxk_bphy/meson.build +++ b/drivers/raw/cnxk_bphy/meson.build @@ -2,7 +2,7 @@ # Copyright(C) 2021 Marvell. # -deps += ['bus_pci', 'common_cnxk', 'rawdev'] +deps += ['common_cnxk', 'rawdev'] sources = files( 'cnxk_bphy.c', 'cnxk_bphy_cgx.c', diff --git a/drivers/raw/cnxk_gpio/meson.build b/drivers/raw/cnxk_gpio/meson.build index 9d9a527392..6d17fe573f 100644 --- a/drivers/raw/cnxk_gpio/meson.build +++ b/drivers/raw/cnxk_gpio/meson.build @@ -2,7 +2,7 @@ # Copyright(C) 2021 Marvell. # -deps += ['bus_vdev', 'common_cnxk', 'rawdev', 'kvargs'] +deps += ['bus_vdev', 'common_cnxk', 'rawdev'] sources = files( 'cnxk_gpio.c', 'cnxk_gpio_irq.c', diff --git a/drivers/raw/ntb/meson.build b/drivers/raw/ntb/meson.build index 9096f2b25a..8f79d3b16a 100644 --- a/drivers/raw/ntb/meson.build +++ b/drivers/raw/ntb/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation. -deps += ['rawdev', 'mbuf', 'mempool', 'pci', 'bus_pci'] +deps += ['rawdev', 'mbuf', 'bus_pci'] sources = files('ntb.c', 'ntb_hw_intel.c') headers = files('rte_pmd_ntb.h') diff --git a/drivers/raw/skeleton/meson.build b/drivers/raw/skeleton/meson.build index 9d5fcf6514..7d76fe71b3 100644 --- a/drivers/raw/skeleton/meson.build +++ b/drivers/raw/skeleton/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -deps += ['rawdev', 'kvargs', 'mbuf', 'bus_vdev'] +deps += ['rawdev', 'mbuf', 'bus_vdev'] sources = files( 'skeleton_rawdev.c', 'skeleton_rawdev_test.c', diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build index 6070b37501..f75bf2e084 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'] +deps += ['common_mlx5'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() diff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build index f78d36a715..f4ed4f491f 100644 --- a/drivers/vdpa/ifc/meson.build +++ b/drivers/vdpa/ifc/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -deps += 'vhost' +deps += 'bus_pci' sources = files('ifcvf_vdpa.c', 'base/ifcvf.c') includes += include_directories('base') diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build index e01c277b9e..747cdc7c55 100644 --- a/drivers/vdpa/meson.build +++ b/drivers/vdpa/meson.build @@ -11,5 +11,4 @@ drivers = [ 'nfp', 'sfc', ] -std_deps = ['bus_pci'] -std_deps += ['vhost'] +std_deps = ['vhost'] diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build index e224d1bcc9..1263ac43a4 100644 --- a/drivers/vdpa/mlx5/meson.build +++ b/drivers/vdpa/mlx5/meson.build @@ -7,7 +7,7 @@ if not is_linux subdir_done() endif -deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched'] +deps += ['common_mlx5', 'vhost', 'sched'] if not dpdk_conf.has('RTE_COMMON_MLX5') # avoid referencing undefined variables from common/mlx5 subdir_done() diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build index 933f3f18f3..465ca9f220 100644 --- a/drivers/vdpa/sfc/meson.build +++ b/drivers/vdpa/sfc/meson.build @@ -16,7 +16,7 @@ foreach flag: extra_flags endif endforeach -deps += ['common_sfc_efx', 'bus_pci'] +deps += ['common_sfc_efx'] sources = files( 'sfc_vdpa.c', 'sfc_vdpa_hw.c', -- 2.43.0