[PATCH 20.11] config/ppc: fix build with GCC >= 10
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Jan 20 12:02:50 CET 2022
From: David Marchand <david.marchand at redhat.com>
[ backported from 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>
---
Required to fix build on ppc64el with gcc 10+
config/ppc/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index bea72f86b5..dc4a3d8c13 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/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.30.2
More information about the stable
mailing list