[1/4] build: fix quoting on RTE_ARCH string value

Message ID 20190529154132.49955-2-bruce.richardson@intel.com
State New
Delegated to: Thomas Monjalon
Headers show
Series
  • Enhance CPU flag support
Related show

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson May 29, 2019, 3:41 p.m.
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(-)

Comments

Luca Boccassi May 29, 2019, 3:53 p.m. | #1
On Wed, 2019-05-29 at 16:41 +0100, Bruce Richardson wrote:
> 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(-)

Acked-by: Luca Boccassi <bluca@debian.org>

Patch

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) != ''