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 940EC464CA; Mon, 31 Mar 2025 18:10:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8227B40A71; Mon, 31 Mar 2025 18:10:40 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mails.dpdk.org (Postfix) with ESMTP id 70D9640A81 for ; Mon, 31 Mar 2025 18:10:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743437440; x=1774973440; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iDWkCLQZp2uaMFwp8UWdaGrcAfVuEuKUKnIreueXNPU=; b=jT+rMj6SyARxzpwy+dRYkL+0OP75/z2HXThMJAg+fui28jU6hWk/i/kN /odg9AyAewIAn9r6a+gf6Lu0tu9O9HSJSr8z0XughbZQdzoTL9390iPQR yWyTBUDlmnB4X2H98Xs8RLj5qqED0pUS9bNkVdVuxYkAGqdDQ9QxiLzZg p6EYS+OaW1VJx4IG+P0nTi19xNGcdA19znKPOQKiWdLRHoWgGw6ce7dWz SJe0MqDnvHew5qujQEJVQC3ECoPnIXyyqZY2Le+gIFH3pGSGbK/L2tdot PZSA4eJ6R61LR0oimdUHNg1Iy/sgpCjSGTxK60H28f8mw6iGDlyNHvHlF Q==; X-CSE-ConnectionGUID: Xt/snkmESBy42+ZMgrdiEw== X-CSE-MsgGUID: FtPuNUGMSsmONQ87aOTAXQ== X-IronPort-AV: E=McAfee;i="6700,10204,11390"; a="62125706" X-IronPort-AV: E=Sophos;i="6.14,291,1736841600"; d="scan'208";a="62125706" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2025 09:10:39 -0700 X-CSE-ConnectionGUID: iRlvxz6vTlW3rKBZzmnoCA== X-CSE-MsgGUID: c6Dad/tBQw6HzHR7HgmzTQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,291,1736841600"; d="scan'208";a="131132758" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.31]) by orviesa004.jf.intel.com with ESMTP; 31 Mar 2025 09:10:37 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ian Stokes , Vladimir Medvedkin , Anatoly Burakov , Jingjing Wu , Praveen Shetty Subject: [PATCH 04/10] net/intel: use common base code build handling Date: Mon, 31 Mar 2025 17:09:54 +0100 Message-ID: <20250331161000.9886-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250331161000.9886-1-bruce.richardson@intel.com> References: <20250331161000.9886-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 Use the base code build handling logic in the drivers/meson.build file, rather than re-implementing it in the drivers. Signed-off-by: Bruce Richardson --- drivers/net/intel/e1000/meson.build | 3 --- drivers/net/intel/fm10k/meson.build | 3 --- drivers/net/intel/i40e/meson.build | 2 -- drivers/net/intel/iavf/meson.build | 1 - drivers/net/intel/ice/base/meson.build | 22 +++++++--------------- drivers/net/intel/ice/meson.build | 2 -- drivers/net/intel/idpf/meson.build | 1 - drivers/net/intel/ixgbe/meson.build | 3 --- 8 files changed, 7 insertions(+), 30 deletions(-) diff --git a/drivers/net/intel/e1000/meson.build b/drivers/net/intel/e1000/meson.build index b52a843228..924fe4ecae 100644 --- a/drivers/net/intel/e1000/meson.build +++ b/drivers/net/intel/e1000/meson.build @@ -3,7 +3,6 @@ subdir('base') -sources += base_sources sources += files( 'e1000_logs.c', 'em_ethdev.c', @@ -24,5 +23,3 @@ if not is_windows 'igc_txrx.c', ) endif - -includes += include_directories('base') diff --git a/drivers/net/intel/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build index e08a00cb49..fac4750f8d 100644 --- a/drivers/net/intel/fm10k/meson.build +++ b/drivers/net/intel/fm10k/meson.build @@ -9,7 +9,6 @@ endif subdir('base') -sources += base_sources sources += files( 'fm10k_ethdev.c', 'fm10k_rxtx.c', @@ -17,5 +16,3 @@ sources += files( if arch_subdir == 'x86' sources += files('fm10k_rxtx_vec.c') endif - -includes += include_directories('base') diff --git a/drivers/net/intel/i40e/meson.build b/drivers/net/intel/i40e/meson.build index 720706ff1e..49e7f899e6 100644 --- a/drivers/net/intel/i40e/meson.build +++ b/drivers/net/intel/i40e/meson.build @@ -19,7 +19,6 @@ endif subdir('base') -sources += base_sources sources += files( 'i40e_ethdev.c', 'i40e_rxtx.c', @@ -36,7 +35,6 @@ sources += files( testpmd_sources = files('i40e_testpmd.c') deps += ['hash'] -includes += include_directories('base') if arch_subdir == 'x86' sources += files('i40e_rxtx_vec_sse.c') diff --git a/drivers/net/intel/iavf/meson.build b/drivers/net/intel/iavf/meson.build index 7e03881529..3b1da8a796 100644 --- a/drivers/net/intel/iavf/meson.build +++ b/drivers/net/intel/iavf/meson.build @@ -24,7 +24,6 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) -includes += include_directories('base') if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build index e7ba9c34bc..f453005a1d 100644 --- a/drivers/net/intel/ice/base/meson.build +++ b/drivers/net/intel/ice/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018-2021 Intel Corporation -sources = [ +base_sources = files( 'ice_controlq.c', 'ice_common.c', 'ice_sched.c', @@ -29,7 +29,7 @@ sources = [ 'ice_ddp.c', 'ice_fwlog.c', 'ice_vf_mbx.c', -] +) if is_ms_compiler error_cflags = [ @@ -41,22 +41,14 @@ else '-Wno-unused-but-set-variable', '-Wno-unused-parameter', ] + # Bugzilla ID: 678 + #if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0')) + # error_cflags += ['-Wno-array-bounds'] + #endif endif -# Bugzilla ID: 678 -if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0')) - error_cflags += ['-Wno-array-bounds'] -endif - -c_args = cflags - foreach flag: error_cflags if cc.has_argument(flag) - c_args += flag + base_cflags += flag endif endforeach - -base_lib = static_library('ice_base', sources, - dependencies: static_rte_eal, - c_args: c_args) -base_objs = base_lib.extract_all_objects(recursive: true) diff --git a/drivers/net/intel/ice/meson.build b/drivers/net/intel/ice/meson.build index 70ec746e50..8a20d0f297 100644 --- a/drivers/net/intel/ice/meson.build +++ b/drivers/net/intel/ice/meson.build @@ -2,7 +2,6 @@ # Copyright(c) 2018 Intel Corporation subdir('base') -objs = [base_objs] sources = files( 'ice_acl_filter.c', @@ -19,7 +18,6 @@ sources = files( testpmd_sources = files('ice_testpmd.c') deps += ['hash', 'net'] -includes += include_directories('base') if dpdk_conf.has('RTE_NET_IAVF') deps += 'net_iavf' diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build index 44e59c6910..a805d02ea2 100644 --- a/drivers/net/intel/idpf/meson.build +++ b/drivers/net/intel/idpf/meson.build @@ -11,7 +11,6 @@ subdir('base') includes += include_directories('../iavf/base') -sources += base_sources sources += files( 'idpf_common_device.c', 'idpf_common_rxtx.c', diff --git a/drivers/net/intel/ixgbe/meson.build b/drivers/net/intel/ixgbe/meson.build index 23f5a6cb3e..d1122bb9cd 100644 --- a/drivers/net/intel/ixgbe/meson.build +++ b/drivers/net/intel/ixgbe/meson.build @@ -5,7 +5,6 @@ cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] subdir('base') -sources += base_sources sources += files( 'ixgbe_82599_bypass.c', 'ixgbe_bypass.c', @@ -32,6 +31,4 @@ elif arch_subdir == 'arm' sources += files('ixgbe_recycle_mbufs_vec_common.c') endif -includes += include_directories('base') - headers = files('rte_pmd_ixgbe.h') -- 2.45.2