* [dpdk-stable] [PATCH 1/4] build: fix quoting on RTE_ARCH string value
[not found] <20190529154132.49955-1-bruce.richardson@intel.com>
@ 2019-05-29 15:41 ` Bruce Richardson
2019-05-29 15:53 ` Luca Boccassi
2019-05-29 15:41 ` [dpdk-stable] [PATCH 2/4] config/arm: fix missing define for arm platforms Bruce Richardson
1 sibling, 1 reply; 3+ messages in thread
From: Bruce Richardson @ 2019-05-29 15:41 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, bluca, stable
The value for RTE_ARCH needs to be quoted when output to the
rte_build_config.h file, so use "set_quoted" rather than "set" when
assigning it.
Fixes: a25a650be5f0 ("build: add infrastructure for meson and ninja builds")
Fixes: 54d609a13876 ("build: add ppc64 meson build")
Cc: bluca@debian.org
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/ppc_64/meson.build | 2 +-
config/x86/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/ppc_64/meson.build b/config/ppc_64/meson.build
index 7ceae1d39..9246d319c 100644
--- a/config/ppc_64/meson.build
+++ b/config/ppc_64/meson.build
@@ -4,7 +4,7 @@
if not dpdk_conf.get('RTE_ARCH_64')
error('Only 64-bit compiles are supported for this platform type')
endif
-dpdk_conf.set('RTE_ARCH', 'ppc_64')
+dpdk_conf.set_quoted('RTE_ARCH', 'ppc_64')
dpdk_conf.set('RTE_ARCH_PPC_64', 1)
# overrides specific to ppc64
diff --git a/config/x86/meson.build b/config/x86/meson.build
index bb23771b4..1a88e52d9 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -31,10 +31,10 @@ endforeach
dpdk_conf.set('RTE_ARCH_X86', 1)
if dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_ARCH_X86_64', 1)
- dpdk_conf.set('RTE_ARCH', 'x86_64')
+ dpdk_conf.set_quoted('RTE_ARCH', 'x86_64')
else
dpdk_conf.set('RTE_ARCH_I686', 1)
- dpdk_conf.set('RTE_ARCH', 'i686')
+ dpdk_conf.set_quoted('RTE_ARCH', 'i686')
endif
if cc.get_define('__AES__', args: machine_args) != ''
--
2.21.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [dpdk-stable] [PATCH 2/4] config/arm: fix missing define for arm platforms
[not found] <20190529154132.49955-1-bruce.richardson@intel.com>
2019-05-29 15:41 ` [dpdk-stable] [PATCH 1/4] build: fix quoting on RTE_ARCH string value Bruce Richardson
@ 2019-05-29 15:41 ` Bruce Richardson
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Richardson @ 2019-05-29 15:41 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable
The RTE_ARCH macro was defined for all platforms when using make, but was
only defined for x86 and ppc platforms when using meson. Fix this omission.
Fixes: b1d48c41189a ("build: support ARM with meson")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/arm/meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 7fa6ed310..a4eb1fc50 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -113,6 +113,7 @@ dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
if not dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+ dpdk_conf.set_quoted('RTE_ARCH', 'arm')
dpdk_conf.set('RTE_ARCH_ARM', 1)
dpdk_conf.set('RTE_ARCH_ARMv7', 1)
# the minimum architecture supported, armv7-a, needs the following,
@@ -120,6 +121,7 @@ if not dpdk_conf.get('RTE_ARCH_64')
machine_args += '-mfpu=neon'
else
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
+ dpdk_conf.set_quoted('RTE_ARCH', 'arm64')
dpdk_conf.set('RTE_ARCH_ARM64', 1)
machine = []
--
2.21.0
^ permalink raw reply [flat|nested] 3+ messages in thread