patch 'build: fix toolchain definition' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/28/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/aff575df4669cd22b39666d44341f5cb51a71ccb

Thanks.

Kevin

---
>From aff575df4669cd22b39666d44341f5cb51a71ccb Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 7 Feb 2023 15:22:00 +0000
Subject: [PATCH] build: fix toolchain definition

[ upstream commit e08c1645df1f2967b331e132ddb36ba817812dc2 ]

When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK,
meson reports the toolchain as "intel-llvm"[1]. This value is used
directly to define the RTE_TOOLCHAIN macros, which means that we end up
with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the
compiler warning:

rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name

This can be fixed, and the macro generation made more robust generally,
by adding "underscorify()" on the string. This replaces the "-", and
any other invalid characters, with "_" [2].

[1] https://mesonbuild.com/Reference-tables.html#compiler-ids
[2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify

Fixes: afd18fa21b5e ("build: set toolchain info during meson configure")

Reported-by: Keith Wiles <keith.wiles at intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Keith Wiles <keith.wiles at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 config/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index ee12318d4f..44c0ca15c6 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -138,5 +138,5 @@ endif
 toolchain = cc.get_id()
 dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
-dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1)
+dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper().underscorify(), 1)
 
 dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:26.109272096 +0000
+++ 0096-build-fix-toolchain-definition.patch	2023-02-23 14:46:23.887236374 +0000
@@ -1 +1 @@
-From e08c1645df1f2967b331e132ddb36ba817812dc2 Mon Sep 17 00:00:00 2001
+From aff575df4669cd22b39666d44341f5cb51a71ccb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e08c1645df1f2967b331e132ddb36ba817812dc2 ]
+
@@ -22 +23,0 @@
-Cc: stable at dpdk.org
@@ -33 +34 @@
-index 26f3168bc9..fc3ac99a32 100644
+index ee12318d4f..44c0ca15c6 100644
@@ -36 +37 @@
-@@ -140,5 +140,5 @@ endif
+@@ -138,5 +138,5 @@ endif