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 65A43464A2; Fri, 28 Mar 2025 12:17:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECBE740691; Fri, 28 Mar 2025 12:16:46 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by mails.dpdk.org (Postfix) with ESMTP id 37B0B409FA for ; Fri, 28 Mar 2025 12:16:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743160605; x=1774696605; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dewk3UAJNAPqnX8DsJ31/Uwg9BR+3fIsEDnNgPNq584=; b=Z1mnVRiH/OpumwBsAkroIbziJVaam9tsRa9Pcz5598juKY0gAbL3hEm7 wK8PacMlNfuwKJJWdUI5cjBIvZe+4+Lu4jmFZYvK63sAHU08xY8yET71M 0Th7m006TdoMv3k7NZYoOwR12F+B5dT7JE8AYPNE/ED9qQQcKVylGYiaK l6TNJgitO/coWLptimt7+rbrJHlofYJ7HpvJPldzGTQj7Ps4VAre5eeFM yZlZOZ+UnzFC41VCywl74JuhDSm/xTli7t9M42VOEeSHgIqDG4NwfScX8 QTdno3+Ht8aczIgsUeKm9waoRo/cNGxJTbpr4//PDiIBaHv+hy1l462oI Q==; X-CSE-ConnectionGUID: CEmvSEE8TNyz1VR+zYnb2g== X-CSE-MsgGUID: WaWmoC9mRjqi71em2agp9A== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="44435482" X-IronPort-AV: E=Sophos;i="6.14,283,1736841600"; d="scan'208";a="44435482" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2025 04:16:44 -0700 X-CSE-ConnectionGUID: HyB7XZqWTymJpIRHeU7J7w== X-CSE-MsgGUID: 6fv3ebK2T6GPITKYjvuAWw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,283,1736841600"; d="scan'208";a="125423323" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.31]) by orviesa006.jf.intel.com with ESMTP; 28 Mar 2025 04:16:42 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Anatoly Burakov , Vladimir Medvedkin , Bruce Richardson Subject: [PATCH v4 9/9] net/intel: simplify base code builds Date: Fri, 28 Mar 2025 11:16:21 +0000 Message-ID: <20250328111621.2665257-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328111621.2665257-1-bruce.richardson@intel.com> References: <20250326155230.1315056-1-bruce.richardson@intel.com> <20250328111621.2665257-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 Now that base-code warning flags have been removed from a number of drivers, we can simplify their build configuration by just including the base code files in the regular list of driver files passed back. There is no need to use pre-compiled objects. Signed-off-by: Bruce Richardson --- drivers/net/intel/e1000/base/meson.build | 9 ++------- drivers/net/intel/e1000/meson.build | 4 ++-- drivers/net/intel/fm10k/base/meson.build | 9 ++------- drivers/net/intel/fm10k/meson.build | 4 ++-- drivers/net/intel/i40e/base/meson.build | 9 ++------- drivers/net/intel/i40e/meson.build | 4 ++-- drivers/net/intel/idpf/base/meson.build | 2 +- drivers/net/intel/idpf/meson.build | 7 ++++--- drivers/net/intel/ixgbe/base/meson.build | 9 ++------- drivers/net/intel/ixgbe/meson.build | 4 ++-- 10 files changed, 21 insertions(+), 40 deletions(-) diff --git a/drivers/net/intel/e1000/base/meson.build b/drivers/net/intel/e1000/base/meson.build index 8cbd9f62e6..4fe86dc6df 100644 --- a/drivers/net/intel/e1000/base/meson.build +++ b/drivers/net/intel/e1000/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -sources = [ +base_sources = files( 'e1000_base.c', 'e1000_80003es2lan.c', 'e1000_82540.c', @@ -21,9 +21,4 @@ sources = [ 'e1000_osdep.c', 'e1000_phy.c', 'e1000_vf.c', -] - -base_lib = static_library('e1000_base', sources, - dependencies: static_rte_eal, - c_args: cflags) -base_objs = base_lib.extract_all_objects(recursive: true) +) diff --git a/drivers/net/intel/e1000/meson.build b/drivers/net/intel/e1000/meson.build index cd42c0042a..b52a843228 100644 --- a/drivers/net/intel/e1000/meson.build +++ b/drivers/net/intel/e1000/meson.build @@ -2,9 +2,9 @@ # Copyright(c) 2017 Intel Corporation subdir('base') -objs = [base_objs] -sources = files( +sources += base_sources +sources += files( 'e1000_logs.c', 'em_ethdev.c', 'em_rxtx.c', diff --git a/drivers/net/intel/fm10k/base/meson.build b/drivers/net/intel/fm10k/base/meson.build index a2640d1ee8..c45b31d6b2 100644 --- a/drivers/net/intel/fm10k/base/meson.build +++ b/drivers/net/intel/fm10k/base/meson.build @@ -1,16 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -sources = [ +base_sources = files( 'fm10k_api.c', 'fm10k_common.c', 'fm10k_mbx.c', 'fm10k_pf.c', 'fm10k_tlv.c', 'fm10k_vf.c', -] - -base_lib = static_library('fm10k_base', sources, - dependencies: static_rte_eal, - c_args: cflags) -base_objs = base_lib.extract_all_objects(recursive: true) +) diff --git a/drivers/net/intel/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build index 69566add96..e08a00cb49 100644 --- a/drivers/net/intel/fm10k/meson.build +++ b/drivers/net/intel/fm10k/meson.build @@ -8,9 +8,9 @@ if is_windows endif subdir('base') -objs = [base_objs] -sources = files( +sources += base_sources +sources += files( 'fm10k_ethdev.c', 'fm10k_rxtx.c', ) diff --git a/drivers/net/intel/i40e/base/meson.build b/drivers/net/intel/i40e/base/meson.build index 766383101b..7b4882ad1d 100644 --- a/drivers/net/intel/i40e/base/meson.build +++ b/drivers/net/intel/i40e/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2020 Intel Corporation -sources = [ +base_sources = files( 'i40e_adminq.c', 'i40e_common.c', 'i40e_dcb.c', @@ -9,9 +9,4 @@ sources = [ 'i40e_hmc.c', 'i40e_lan_hmc.c', 'i40e_nvm.c', -] - -base_lib = static_library('i40e_base', sources, - dependencies: static_rte_eal, - c_args: cflags) -base_objs = base_lib.extract_all_objects(recursive: true) +) diff --git a/drivers/net/intel/i40e/meson.build b/drivers/net/intel/i40e/meson.build index 15993393fb..17b6715cd9 100644 --- a/drivers/net/intel/i40e/meson.build +++ b/drivers/net/intel/i40e/meson.build @@ -18,9 +18,9 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 endif subdir('base') -objs = [base_objs] -sources = files( +sources += base_sources +sources += files( 'i40e_ethdev.c', 'i40e_rxtx.c', 'i40e_pf.c', diff --git a/drivers/net/intel/idpf/base/meson.build b/drivers/net/intel/idpf/base/meson.build index 7316e0a805..78782e463e 100644 --- a/drivers/net/intel/idpf/base/meson.build +++ b/drivers/net/intel/idpf/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2023 Intel Corporation -sources += files( +base_sources = files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build index 4b272d02b1..a8690da87b 100644 --- a/drivers/net/intel/idpf/meson.build +++ b/drivers/net/intel/idpf/meson.build @@ -7,9 +7,12 @@ if is_windows subdir_done() endif +subdir('base') + includes += include_directories('../iavf/base') -sources = files( +sources += base_sources +sources += files( 'idpf_common_device.c', 'idpf_common_rxtx.c', 'idpf_common_virtchnl.c', @@ -43,5 +46,3 @@ if arch_subdir == 'x86' and dpdk_conf.get('RTE_IOVA_IN_MBUF') == 1 objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif endif - -subdir('base') diff --git a/drivers/net/intel/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build index 2af8a55e92..c0b14a1db3 100644 --- a/drivers/net/intel/ixgbe/base/meson.build +++ b/drivers/net/intel/ixgbe/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2024 Intel Corporation -sources = [ +base_sources = files( 'ixgbe_82598.c', 'ixgbe_82599.c', 'ixgbe_api.c', @@ -16,9 +16,4 @@ sources = [ 'ixgbe_vf.c', 'ixgbe_x540.c', 'ixgbe_x550.c', -] - -base_lib = static_library('ixgbe_base', sources, - dependencies: [static_rte_eal, static_rte_net], - c_args: c_args) -base_objs = base_lib.extract_all_objects(recursive: true) +) diff --git a/drivers/net/intel/ixgbe/meson.build b/drivers/net/intel/ixgbe/meson.build index 0bee736a2c..23f5a6cb3e 100644 --- a/drivers/net/intel/ixgbe/meson.build +++ b/drivers/net/intel/ixgbe/meson.build @@ -4,9 +4,9 @@ cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] subdir('base') -objs = [base_objs] -sources = files( +sources += base_sources +sources += files( 'ixgbe_82599_bypass.c', 'ixgbe_bypass.c', 'ixgbe_ethdev.c', -- 2.45.2