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 28294A034C for ; Fri, 25 Feb 2022 18:16:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2336A410FD; Fri, 25 Feb 2022 18:16:14 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 65BE7410FD for ; Fri, 25 Feb 2022 18:16:13 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 31EF53FCA5 for ; Fri, 25 Feb 2022 17:16:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809373; bh=xbzlBjH7pG+fDN0NObKwAxxLjkRjLIbXwdF27Fmv+mw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iZY1WJvSPZJEu+qW8Md+BIEipZgrBg7TCMXJYhfds5GM8ChKFu5NetzgGccKFZ/yT mvv6TtMnKjUDpdm2FsPTdN2TZC0xblsz/eZByU8xu/tlk47+LaVCARJ4YsRSKBzbub KgFEBPHr25I3KZAp3lCHIV9feOZqGbFezBOmW4pWQgOLCzjjGIpIRbostoDU1ASLte 0KNfivRsFJIcgqlexxTNE7DX0y1456ZYm1uWfRWZ5iISEfozEh3VVdFSwv9gBYkMA1 8Tc+iyQ8f7LfUdL3P8cUOCDIXTGAwD+oCip7LYnm6oYRzUFpCdnoHnbzHIer8HGvf4 PT4Z/WlWad+BA== Received: by mail-wm1-f69.google.com with SMTP id m21-20020a7bcf35000000b00380e364b5d2so1607857wmg.2 for ; Fri, 25 Feb 2022 09:16:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xbzlBjH7pG+fDN0NObKwAxxLjkRjLIbXwdF27Fmv+mw=; b=D33okkEcRHb8trzkNnuAcz4V5fJlVWJkrBI3MjdO6XvHX3iqgNUUMuuJFKpDVuza6U 3I2+A2q58nO6gCl4/QbNneJEsfYvvVgAjgXalqmnLr7YbD40+P9/2Eusf1XVh8JugjpF cOPKom4Kj22POMubL+RSNDjdw3Q7pwximRdHWeZyh4KQmbgbqQ01E90d+FE/aLOt3EkI kLtRLwqX/7VQ3SyPvEruo8f+bY+NYLLabI0Ba7Gse8Tw7S0m2QQJSjTG3wVP0xhrMc2m yLOGi1JEVuUdtHBzwFie1pcaRY0U8yYX+6BevJFSxgJ2aHi9pFQkHWjBB3INflscXp9m anNg== X-Gm-Message-State: AOAM531x/5K2dmPyp9CNeWKheG52mHW1SGPcy87A8vPBqfmrH3KgCF7l I/P2qztrUJQ2DF3XGJjIMBIpfz2UTEFNL18ymTcXZN9a7UK2A7mOBfS99373w8lEgt2DqgwpGGG vqE8hQJSYM7BeEw7Zzp82IE/L X-Received: by 2002:adf:b34a:0:b0:1ea:8df9:318c with SMTP id k10-20020adfb34a000000b001ea8df9318cmr7066126wrd.190.1645809372821; Fri, 25 Feb 2022 09:16:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNc4e+YqBF9XMGFyVyjK74FS0I/ig/7x9rcLsbMNKqMW067LZUVuUzOrF2HqriSv7Sby0oUQ== X-Received: by 2002:adf:b34a:0:b0:1ea:8df9:318c with SMTP id k10-20020adfb34a000000b001ea8df9318cmr7066114wrd.190.1645809372602; Fri, 25 Feb 2022 09:16:12 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id s3-20020a5d4ec3000000b001ea95eba44dsm2625340wrv.109.2022.02.25.09.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:12 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Ferruh Yigit , Bruce Richardson , Christian Ehrhardt , dpdk stable Subject: patch 'config/ppc: fix build with GCC >= 10' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:14:59 +0100 Message-Id: <20220225171550.3499040-6-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 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 19.11.12 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/27/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a489d32bfe9fcd6839476d135efea82ed3026491 Thanks. Christian Ehrhardt --- >From a489d32bfe9fcd6839476d135efea82ed3026491 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 15 Sep 2021 07:08:12 +0200 Subject: [PATCH] config/ppc: fix build with GCC >= 10 [ upstream commit dfb1ad1e7a070926c9bd9fdf38e6b944a21f1d49 ] Like for python, multiline statements in meson must either use a backslash character (explicit continuation) or be enclosed in () (implicit continuation). python PEP8 recommends the latter [1], and it looks like meson had an issue with backslash before 0.50 [2]. 1: https://www.python.org/dev/peps/pep-0008/#multiline-if-statements 2: https://github.com/mesonbuild/meson/commit/90c9b868b20b Fixes: 394407f50c90 ("config/ppc: ignore GCC 11 psabi warnings") Reported-by: Ferruh Yigit Signed-off-by: David Marchand Tested-by: Ferruh Yigit Acked-by: Bruce Richardson Signed-off-by: Christian Ehrhardt --- config/ppc_64/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ppc_64/meson.build b/config/ppc_64/meson.build index 303b249570..aed37a6b59 100644 --- a/config/ppc_64/meson.build +++ b/config/ppc_64/meson.build @@ -20,8 +20,8 @@ endif # Suppress the gcc warning "note: the layout of aggregates containing # vectors with 4-byte alignment has changed in GCC 5". -if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0') and - cc.version().version_compare('<12.0') and cc.has_argument('-Wno-psabi') +if (cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0') and + cc.version().version_compare('<12.0') and cc.has_argument('-Wno-psabi')) add_project_arguments('-Wno-psabi', language: 'c') endif -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.538790357 +0100 +++ 0006-config-ppc-fix-build-with-GCC-10.patch 2022-02-25 16:58:44.192990370 +0100 @@ -1 +1 @@ -From dfb1ad1e7a070926c9bd9fdf38e6b944a21f1d49 Mon Sep 17 00:00:00 2001 +From a489d32bfe9fcd6839476d135efea82ed3026491 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dfb1ad1e7a070926c9bd9fdf38e6b944a21f1d49 ] + @@ -21,0 +24 @@ +Signed-off-by: Christian Ehrhardt @@ -23 +26 @@ - config/ppc/meson.build | 4 ++-- + config/ppc_64/meson.build | 4 ++-- @@ -26,4 +29,4 @@ -diff --git a/config/ppc/meson.build b/config/ppc/meson.build -index 0b1948fc7c..aa1327a595 100644 ---- a/config/ppc/meson.build -+++ b/config/ppc/meson.build +diff --git a/config/ppc_64/meson.build b/config/ppc_64/meson.build +index 303b249570..aed37a6b59 100644 +--- a/config/ppc_64/meson.build ++++ b/config/ppc_64/meson.build