aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2023-05-08 21:03:29 +1200
committerChris Packham <judge.packham@gmail.com>2023-05-14 10:35:14 +1200
commit584b25da7a81d2f08935256df3cf16a115001e9d (patch)
treec1b0165995c13286d8188fbd6d594cb5996358f5
parent5427dac45c12f6be8e3fca7bc38b9abcebb4ec87 (diff)
downloadcrosstool-ng-584b25da7a81d2f08935256df3cf16a115001e9d.tar.gz
crosstool-ng-584b25da7a81d2f08935256df3cf16a115001e9d.tar.bz2
crosstool-ng-584b25da7a81d2f08935256df3cf16a115001e9d.zip
glibc: Disable -Werror with GCC13 and glibc <2.37
GCC13 picks up some new errors on older glibc versions. Disable -Werror automatically when these combinations are selected. Signed-off-by: Chris Packham <judge.packham@gmail.com>
-rw-r--r--config/libc/glibc.in4
-rw-r--r--packages/glibc/package.desc2
2 files changed, 4 insertions, 2 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 39ab7930..c5de44ce 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -406,13 +406,15 @@ config GLIBC_SSP
# GCC9-related fixes were available in glibc 2.29
# GCC10-related fixes were available in glibc 2.31
# GCC11-related fixes were available in glibc 2.34
+# GCC13-related fixes were available in glibc 2.37
config GLIBC_ENABLE_WERROR
bool "Enable -Werror during the build"
depends on GCC_7_or_older || \
(GCC_8_or_later && !GCC_9_or_later && GLIBC_2_27_or_later) || \
(GCC_9_or_later && !GCC_10_or_later && GLIBC_2_29_or_later) || \
(GCC_10_or_later && !GCC_11_or_later && GLIBC_2_31_or_later) || \
- (GCC_11_or_later && GLIBC_2_34_or_later)
+ (GCC_11_or_later && !GCC_13_or_later && GLIBC_2_34_or_later) || \
+ (GCC_13_or_later && GLIBC_2_37_or_later)
default y
help
By default, glibc enables strict warning checks during the build.
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index d25f0530..56dfff1a 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 2.31 2.32 2.34 2.36'
+milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.30 2.31 2.32 2.34 2.36 2.37'
archive_formats='.tar.xz .tar.bz2 .tar.gz'
signature_format='packed/.sig'