From 93d5d7664faaf3a0e63c58cd74105c3c8364130b Mon Sep 17 00:00:00 2001 From: Michał Zagórski Date: Sun, 11 May 2025 17:52:05 +0200 Subject: Use -std=c17 for companion libs, which won't build with C23 standard, default for gcc15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Zagórski --- config/comp_libs/gmp.in | 5 +++++ config/comp_libs/ncurses.in | 5 +++++ scripts/build/companion_libs/100-gmp.sh | 2 ++ scripts/build/companion_libs/220-ncurses.sh | 2 ++ 4 files changed, 14 insertions(+) diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in index f49d1a71..7baac528 100644 --- a/config/comp_libs/gmp.in +++ b/config/comp_libs/gmp.in @@ -1 +1,6 @@ # GMP options +config GMP_EXTRA_CFLAGS + string "extra target CFLAGS" + default "-std=gnu17" if GCC_15_or_later + help + Extra target CFLAGS to use when building. diff --git a/config/comp_libs/ncurses.in b/config/comp_libs/ncurses.in index 4e7e6d47..3d257439 100644 --- a/config/comp_libs/ncurses.in +++ b/config/comp_libs/ncurses.in @@ -55,3 +55,8 @@ config NCURSES_TARGET_FALLBACKS List of terminal descriptions that will be compiled into the curses library for the target. +config NCURSES_EXTRA_CFLAGS + string "extra target CFLAGS" + default "-std=gnu17" if GCC_15_or_later + help + Extra target CFLAGS fto use when building. diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 244082f8..4ecaa721 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -122,6 +122,8 @@ do_gmp_backend() { extra_config+=("--with-pic") fi + cflags+=" ${CT_GMP_EXTRA_CFLAGS}" + # GMP's configure script doesn't respect the host parameter # when not cross-compiling, ie when build == host so set # CC_FOR_BUILD and CPP_FOR_BUILD. diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index c8c083ee..36aadae6 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -152,6 +152,8 @@ do_ncurses_backend() { ncurses_opts+=("--with-shared") fi + cflags+=" ${CT_NCURSES_EXTRA_CFLAGS}" + CT_DoLog EXTRA "Configuring ncurses" CT_DoExecLog CFG \ CFLAGS="${cflags}" \ -- cgit v1.2.3