From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id E1EC741D4F
for <public@inbox.dpdk.org>; Thu, 23 Feb 2023 10:40:50 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D955E43158;
Thu, 23 Feb 2023 10:40:50 +0100 (CET)
Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com
[209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id EA01E43150
for <stable@dpdk.org>; Thu, 23 Feb 2023 10:40:48 +0100 (CET)
Received: by mail-wm1-f44.google.com with SMTP id
l2-20020a05600c1d0200b003e1f6dff952so9479012wms.1
for <stable@dpdk.org>; Thu, 23 Feb 2023 01:40:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ck05fbIco3Sd3LRAtTfm9YmVTtknRnTBxWNccl7jJro=;
b=CkOipX6VvPsfq75MCOLfD3JbewaCqwkGG0pyhWeIZc1UpkMjaabOAMGUW+M5uDzFt8
pN6moMoBgX2KRHWZmF50ROZUS01chIPk6JyDsJUp9xlT14mzIThGkJJptZFhth46St8D
AngCPboCZ8rvlUcI6iHxCI4gGp5ALpoJnOqetjcjCCBDoi7aMMn71L6zsHi412DKtN7X
BG5bDk4xcShRrOCV98DGPaUn7or4eCRUNiMMF6uFn7unFcJPirgRnt3sC/ho2fLU4tfo
mOgB4qdKuwBz2SZC2vQhyQ89XncaqcKw+DJXuOlHyoPF9L7N5DM6f/ZwruAhckcCu9I2
9gtg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ck05fbIco3Sd3LRAtTfm9YmVTtknRnTBxWNccl7jJro=;
b=M412Xp3F2sn4hXWQUdupIKCd0wf2nlcqiwB5g+dhymN1/TYBfvxEo+H4XwfMzvvDrl
/JdAKzn5ZKEhmbzofyODyibJHaT/aEyNvIbkHcGONif0T3vQgrxz7QAfHHO/mfQGTLrU
ciDXFUe3d/eRJSVJK7NP/Hh9dMyVEJd7hFB0+LiZlchOJggTE0t6X+8wNaUjmwtErCgx
LOFNmUoVCl/pnBZu9qUbovqCIW02X1RK/qp096niu+qxq9oI5gpd4cMrTMWHl2+5yiyp
AHT9/KcOzqrFQngz2vgaefj3eYczRLjnY8tKsgP4GSP7vrEFn4xYCpNUBLDo4QHm9SXi
8Apw==
X-Gm-Message-State: AO0yUKWjljXmjp5W5htd6Uobs+wKZx9BQ0IR54sBsmz8plg9paVZE7Ek
Ismoi0gX+ivjpiXzzH1S3SE=
X-Google-Smtp-Source: AK7set89jTa0J+IadOUn45yLcGOQZ4Tk0SjJKTn600Uh0IOVe44lHhDxFXt8b52HyAddBgsrtOYSpA==
X-Received: by 2002:a05:600c:4f4e:b0:3e2:d3:b2b6 with SMTP id
m14-20020a05600c4f4e00b003e200d3b2b6mr10602846wmq.14.1677145248615;
Thu, 23 Feb 2023 01:40:48 -0800 (PST)
Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id
n10-20020a05600c500a00b003ea57808179sm1592311wmr.38.2023.02.23.01.40.48
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 23 Feb 2023 01:40:48 -0800 (PST)
From: luca.boccassi@gmail.com
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: Keith Wiles <keith.wiles@intel.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'build: fix toolchain definition' has been queued to stable
release 20.11.8
Date: Thu, 23 Feb 2023 09:37:12 +0000
Message-Id: <20230223093715.3926893-68-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.39.1
In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com>
References: <20230223093715.3926893-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 20.11.8
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/25/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/25adf87e6057906f21c97ce5640f475df081b290
Thanks.
Luca Boccassi
---
>From 25adf87e6057906f21c97ce5640f475df081b290 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@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@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Keith Wiles <keith.wiles@intel.com>
Acked-by: Tyler Retzlaff <roretzla@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 5058b733e3..b95b1ffa91 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -107,7 +107,7 @@ 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)
dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)
--
2.39.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-23 09:36:31.020459934 +0000
+++ 0068-build-fix-toolchain-definition.patch 2023-02-23 09:36:28.354172297 +0000
@@ -1 +1 @@
-From e08c1645df1f2967b331e132ddb36ba817812dc2 Mon Sep 17 00:00:00 2001
+From 25adf87e6057906f21c97ce5640f475df081b290 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e08c1645df1f2967b331e132ddb36ba817812dc2 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -33 +34 @@
-index 26f3168bc9..fc3ac99a32 100644
+index 5058b733e3..b95b1ffa91 100644
@@ -36 +37 @@
-@@ -139,7 +139,7 @@ endif
+@@ -107,7 +107,7 @@ endif