From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Ian Stokes <ian.stokes@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Praveen Shetty <praveen.shetty@intel.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Subject: [PATCH v2 8/8] net/intel: simplify base code builds
Date: Wed, 26 Mar 2025 16:05:38 +0000 [thread overview]
Message-ID: <20250326160539.1316499-9-bruce.richardson@intel.com> (raw)
In-Reply-To: <20250326160539.1316499-1-bruce.richardson@intel.com>
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 <bruce.richardson@intel.com>
---
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 64e0bfd7be..df42a34369 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',
@@ -17,9 +17,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
next prev parent reply other threads:[~2025-03-26 16:06 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-26 15:52 [PATCH 0/7] net/intel: clean up base code build Bruce Richardson
2025-03-26 15:52 ` [PATCH 1/7] net/iavf/base: remove unused meson.build file Bruce Richardson
2025-03-26 15:52 ` [PATCH 2/7] net/ixgbe/base: correct definition of macro Bruce Richardson
2025-03-26 15:52 ` [PATCH 3/7] net/ixgbe/base: fix compilation warnings Bruce Richardson
2025-03-26 15:52 ` [PATCH 4/7] net/i40e/base: fix unused value warnings Bruce Richardson
2025-03-26 15:52 ` [PATCH 5/7] net/i40e/base: fix compiler warnings Bruce Richardson
2025-03-26 15:52 ` [PATCH 6/7] net/ice/base: reduce warnings for unused variables Bruce Richardson
2025-03-26 15:52 ` [PATCH 7/7] net/intel: simplify base code builds Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 0/8] net/intel: clean up base code build Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 1/8] net/fm10k/base: fix compilation warnings Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 2/8] net/iavf/base: remove unused meson.build file Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 3/8] net/ixgbe/base: correct definition of macro Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 4/8] net/ixgbe/base: fix compilation warnings Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 5/8] net/i40e/base: fix unused value warnings Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 6/8] net/i40e/base: fix compiler warnings Bruce Richardson
2025-03-26 16:05 ` [PATCH v2 7/8] net/ice/base: reduce warnings for unused variables Bruce Richardson
2025-03-26 16:05 ` Bruce Richardson [this message]
2025-03-27 14:51 ` [PATCH v3 0/9] net/intel: clean up base code build Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 1/9] net/fm10k/base: fix compilation warnings Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 2/9] net/iavf/base: remove unused meson.build file Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 3/9] net/ixgbe/base: correct definition of macro Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 4/9] net/ixgbe/base: fix compilation warnings Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 5/9] net/ixgbe/base: fix lock checker errors Bruce Richardson
2025-03-28 8:20 ` David Marchand
2025-03-28 10:43 ` Bruce Richardson
2025-03-28 11:13 ` Bruce Richardson
2025-03-28 11:48 ` David Marchand
2025-03-27 14:51 ` [PATCH v3 6/9] net/i40e/base: fix unused value warnings Bruce Richardson
2025-03-27 14:51 ` [PATCH v3 7/9] net/i40e/base: fix compiler warnings Bruce Richardson
2025-03-27 14:52 ` [PATCH v3 8/9] net/ice/base: reduce warnings for unused variables Bruce Richardson
2025-03-27 14:52 ` [PATCH v3 9/9] net/intel: simplify base code builds Bruce Richardson
2025-03-28 8:21 ` [PATCH v3 0/9] net/intel: clean up base code build David Marchand
2025-03-28 9:01 ` Bruce Richardson
2025-03-28 11:16 ` [PATCH v4 " Bruce Richardson
2025-03-28 11:16 ` [PATCH v4 1/9] net/fm10k/base: fix compilation warnings Bruce Richardson
2025-03-28 12:53 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 2/9] net/iavf/base: remove unused meson.build file Bruce Richardson
2025-03-28 13:00 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 3/9] net/ixgbe/base: correct definition of macro Bruce Richardson
2025-03-28 13:01 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 4/9] net/ixgbe/base: fix compilation warnings Bruce Richardson
2025-03-28 13:02 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 5/9] net/ixgbe/base: fix lock checker errors Bruce Richardson
2025-03-28 13:05 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 6/9] net/i40e/base: fix unused value warnings Bruce Richardson
2025-03-28 13:07 ` Burakov, Anatoly
2025-03-28 15:21 ` Andre Muezerie
2025-03-28 15:26 ` Bruce Richardson
2025-03-28 11:16 ` [PATCH v4 7/9] net/i40e/base: fix compiler warnings Bruce Richardson
2025-03-28 13:08 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 8/9] net/ice/base: reduce warnings for unused variables Bruce Richardson
2025-03-28 13:09 ` Burakov, Anatoly
2025-03-28 11:16 ` [PATCH v4 9/9] net/intel: simplify base code builds Bruce Richardson
2025-03-28 13:09 ` Burakov, Anatoly
2025-03-28 16:05 ` [PATCH v4 0/9] net/intel: clean up base code build 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=20250326160539.1316499-9-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).