config/defconfig_arm-armv7a-linux-gcc contains a number of
CONFIG_RTE_LIBRTE_ options. Implement those in applicable meson.build
files.
Signed-off-by: Juraj Linkeš <juraj.lin...@pantheon.tech>
---
drivers/net/ark/meson.build | 6 ++++++
drivers/net/avp/meson.build | 5 +++++
drivers/net/cxgbe/meson.build | 6 ++++++
drivers/net/e1000/meson.build | 6 ++++++
drivers/net/enic/meson.build | 6 ++++++
drivers/net/fm10k/meson.build | 6 ++++++
drivers/net/hinic/meson.build | 6 ++++++
drivers/net/i40e/meson.build | 6 ++++++
drivers/net/ionic/meson.build | 6 ++++++
drivers/net/ixgbe/meson.build | 6 ++++++
drivers/net/qede/meson.build | 6 ++++++
drivers/net/vmxnet3/meson.build | 6 ++++++
lib/librte_vhost/meson.build | 2 +-
13 files changed, 72 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
index 99151bba1..8a875cc94 100644
--- a/drivers/net/ark/meson.build
+++ b/drivers/net/ark/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
sources = files('ark_ddm.c',
'ark_ethdev.c',
'ark_ethdev_rx.c',
diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 793bb185d..f9780ae45 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -4,7 +4,12 @@
if not is_linux
build = false
reason = 'only supported on linux'
+elif dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
endif
+
allow_experimental_apis = true
sources = files('avp_ethdev.c')
install_headers('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 3992aba44..526a64fa2 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
sources = files('cxgbe_ethdev.c',
'cxgbe_main.c',
'cxgbevf_ethdev.c',
diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build
index d0901d377..90cffa7b1 100644
--- a/drivers/net/e1000/meson.build
+++ b/drivers/net/e1000/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
allow_experimental_apis = true
subdir('base')
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index e5eeb5667..69320757d 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Cisco Systems, Inc.
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
# Experimental APIs used: rte_intr_ack
cflags += ['-DALLOW_EXPERIMENTAL_API']
sources = files(
diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build
index 8f6e42392..f74778ae5 100644
--- a/drivers/net/fm10k/meson.build
+++ b/drivers/net/fm10k/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
allow_experimental_apis = true
subdir('base')
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index bc7e24639..f43368793 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Huawei Technologies Co., Ltd
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
subdir('base')
objs = [base_objs]
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index b01babba1..7ace45951 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
cflags += ['-DPF_DRIVER',
'-DVF_DRIVER',
'-DINTEGRATED_VF',
diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build
index 1c6362d27..14ba0317b 100644
--- a/drivers/net/ionic/meson.build
+++ b/drivers/net/ionic/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
# Copyright(c) 2019 Pensando
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
sources = files(
'ionic_mac_api.c',
'ionic_rx_filter.c',
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 06cf42a4a..0c8442b8c 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
allow_experimental_apis = true
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 1755719f0..a357daf50 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bl...@debian.org>
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
allow_experimental_apis = true
subdir('base')
diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build
index a92bd2868..f14318a69 100644
--- a/drivers/net/vmxnet3/meson.build
+++ b/drivers/net/vmxnet3/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bl...@debian.org>
+if dpdk_conf.has('RTE_ARCH_ARMv7')
+ build = false
+ reason = 'Not supported on 32-bit arm'
+ subdir_done()
+endif
+
allow_experimental_apis = true
sources += files(
'vmxnet3_ethdev.c',
diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index ef7a5bced..44d8eda53 100644
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -5,7 +5,7 @@ if not is_linux
build = false
reason = 'only supported on linux'
endif
-if has_libnuma == 1
+if has_libnuma == 1 and not dpdk_conf.has('RTE_ARCH_ARMv7')
dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
endif
if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
--
2.11.0
