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.richard...@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
