From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F17A141D52 for ; Thu, 23 Feb 2023 16:08:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED2CD432D2; Thu, 23 Feb 2023 16:08:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DF851432CC for ; Thu, 23 Feb 2023 16:08:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kqWFypvXYPAn42WHiHa8hL9ekGlchb6uL5bQVp4FtUM=; b=eX3xvNwfE0pC8cFxjs05onBJ/yNXhFTYTatTS+59oeJMSW/zUhp7HFIcFcrfFrRse7ryT0 /3687FQF3RVvZZjne/FJjAG3UkcD/wpojZ/aVC6NFyzDGVfh1vli+IiAV4Yl/N7oADLnqH TqV/TFpC5vwKJfb7c/1hIlbHlTy2WJg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-445-2dEfF6KJMBWTNea2hVFUkw-1; Thu, 23 Feb 2023 10:08:48 -0500 X-MC-Unique: 2dEfF6KJMBWTNea2hVFUkw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B30A2803CBB; Thu, 23 Feb 2023 15:08:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA6352166B29; Thu, 23 Feb 2023 15:08:45 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Keith Wiles , Tyler Retzlaff , dpdk stable Subject: patch 'build: fix toolchain definition' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:27 +0000 Message-Id: <20230223150631.723699-96-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Signed-off-by: Bruce Richardson Acked-by: Keith Wiles Acked-by: Tyler Retzlaff --- 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@dpdk.org @@ -33 +34 @@ -index 26f3168bc9..fc3ac99a32 100644 +index ee12318d4f..44c0ca15c6 100644 @@ -36 +37 @@ -@@ -140,5 +140,5 @@ endif +@@ -138,5 +138,5 @@ endif