patch 'config/ppc: fix build with GCC >= 10' has been queued to stable release 19.11.12

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Feb 25 18:14:59 CET 2022


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 <christian.ehrhardt at canonical.com>

---
>From a489d32bfe9fcd6839476d135efea82ed3026491 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
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 <ferruh.yigit at intel.com>
Signed-off-by: David Marchand <david.marchand at redhat.com>
Tested-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 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 <christian.ehrhardt at canonical.com>
@@ -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


More information about the stable mailing list