summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2020-09-06 09:38:54 (GMT)
committerChris Packham <judge.packham@gmail.com>2020-09-06 09:38:54 (GMT)
commitaa07ac0e01d62d2018d33b7269dbce9dbc4400b8 (patch)
tree7786f5db58454d38a4952386419451d573bb22c4
parent4e5bc43627582b11f11ebc1cedcfd1016f39c60e (diff)
parent645ee12492274dcdfcbfbd53fcec00b9c722bc33 (diff)
Merge branch 'cpackham-powerpc64-glibc-2.32' into master
-rw-r--r--config/libc/glibc.in1
-rw-r--r--packages/glibc/package.desc2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index f891392..fe18eee 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -400,6 +400,7 @@ config GLIBC_SSP
# GCC8-related fixes were only available in glibc 2.27.
config GLIBC_ENABLE_WERROR
bool "Enable -Werror during the build"
+ depends on !(ARCH_POWERPC && ARCH_64 && GLIBC_V_2_32)
default y if GCC_7_or_older
default y if GCC_8_or_later && GLIBC_2_27_or_later
help
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index eba5f00..7a74988 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -3,6 +3,6 @@ repository='git git://sourceware.org/git/glibc.git'
mirrors='$(CT_Mirrors GNU glibc)'
# Cannot use MAJOR.MINOR as the relevant part because of 2.12: 2.12.2 was the most recent
# bugfix release, but it didn't have glibc-ports released alongside it.
-milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.30'
+milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.30 2.32'
archive_formats='.tar.xz .tar.bz2 .tar.gz'
signature_format='packed/.sig'