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>
This commit is contained in:
Chris Packham 2023-05-08 21:03:29 +12:00
parent 5427dac45c
commit 584b25da7a
2 changed files with 4 additions and 2 deletions

View File

@ -406,13 +406,15 @@ config GLIBC_SSP
# GCC9-related fixes were available in glibc 2.29 # GCC9-related fixes were available in glibc 2.29
# GCC10-related fixes were available in glibc 2.31 # GCC10-related fixes were available in glibc 2.31
# GCC11-related fixes were available in glibc 2.34 # GCC11-related fixes were available in glibc 2.34
# GCC13-related fixes were available in glibc 2.37
config GLIBC_ENABLE_WERROR config GLIBC_ENABLE_WERROR
bool "Enable -Werror during the build" bool "Enable -Werror during the build"
depends on GCC_7_or_older || \ depends on GCC_7_or_older || \
(GCC_8_or_later && !GCC_9_or_later && GLIBC_2_27_or_later) || \ (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_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_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 default y
help help
By default, glibc enables strict warning checks during the build. By default, glibc enables strict warning checks during the build.

View File

@ -3,6 +3,6 @@ repository='git git://sourceware.org/git/glibc.git'
mirrors='$(CT_Mirrors GNU glibc)' mirrors='$(CT_Mirrors GNU glibc)'
# Cannot use MAJOR.MINOR as the relevant part because of 2.12: 2.12.2 was the most recent # 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. # 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' archive_formats='.tar.xz .tar.bz2 .tar.gz'
signature_format='packed/.sig' signature_format='packed/.sig'