From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Ian Stokes <ian.stokes@intel.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Praveen Shetty <praveen.shetty@intel.com>
Subject: [PATCH 04/10] net/intel: use common base code build handling
Date: Mon, 31 Mar 2025 17:09:54 +0100 [thread overview]
Message-ID: <20250331161000.9886-6-bruce.richardson@intel.com> (raw)
In-Reply-To: <20250331161000.9886-1-bruce.richardson@intel.com>
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 <bruce.richardson@intel.com>
---
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
next prev parent reply other threads:[~2025-03-31 16:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
2025-03-31 16:09 ` [PATCH 01/10] build: add generic support for base code in drivers Bruce Richardson
2025-03-31 16:09 ` [PATCH 02/10] common/sfc_efx: use common base code build handling Bruce Richardson
2025-04-01 7:10 ` Andrew Rybchenko
2025-03-31 16:09 ` [PATCH 03/10] net/hinic: " Bruce Richardson
2025-03-31 16:09 ` Bruce Richardson [this message]
2025-04-02 13:05 ` [PATCH 04/10] net/intel: " David Marchand
2025-04-02 13:42 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 05/10] net/ngbe: " Bruce Richardson
2025-03-31 16:09 ` [PATCH 06/10] net/octeontx: " Bruce Richardson
2025-03-31 16:09 ` [PATCH 07/10] net/qede: " Bruce Richardson
2025-03-31 16:09 ` [PATCH 08/10] net/thunderx: " Bruce Richardson
2025-03-31 16:09 ` [PATCH 09/10] net/txgbe: " Bruce Richardson
2025-03-31 16:10 ` [PATCH 10/10] raw/ifpga: " Bruce Richardson
2025-04-01 0:27 ` Xu, Rosen
2025-04-02 13:08 ` [PATCH 00/10] centralise base code handling for drivers David Marchand
2025-04-02 13:44 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250331161000.9886-6-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
--cc=ian.stokes@intel.com \
--cc=jingjing.wu@intel.com \
--cc=praveen.shetty@intel.com \
--cc=vladimir.medvedkin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).