commit: 39ba3e621469464a59dc7a37e3c41366d7856066 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Apr 13 18:38:11 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 13 18:40:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ba3e62
sys-libs/glibc: backport CPP fix to 2.38-r11, sync live And fix style to be consistent wrt quoting too. Bug: https://bugs.gentoo.org/927652 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-2.38-r11.ebuild | 6 ++++++ sys-libs/glibc/glibc-2.39-r2.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys-libs/glibc/glibc-2.38-r11.ebuild b/sys-libs/glibc/glibc-2.38-r11.ebuild index 8da751b46e7c..93f0999d1d03 100644 --- a/sys-libs/glibc/glibc-2.38-r11.ebuild +++ b/sys-libs/glibc/glibc-2.38-r11.ebuild @@ -576,10 +576,12 @@ setup_env() { # Reset CC and CXX to the value at start of emerge export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}} # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. export glibc__ORIG_CC=${CC} export glibc__ORIG_CXX=${CXX} + export glibc__ORIG_CPP=${CPP} if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then export glibc__force_gcc=yes @@ -606,6 +608,7 @@ setup_env() { export CC="${current_gcc_path}/gcc" export CPP="${current_gcc_path}/cpp" export CXX="${current_gcc_path}/g++" + export CPP="$(tc-getCPP ${CTARGET})" export LD="${current_binutils_path}/ld.bfd" export AR="${current_binutils_path}/ar" export AS="${current_binutils_path}/as" @@ -644,6 +647,7 @@ setup_env() { # acts on CC?) export glibc__GLIBC_CC=${CC} export glibc__GLIBC_CXX=${CXX} + export glibc__GLIBC_CPP=${CPP} export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" @@ -659,6 +663,8 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time # with ${CTARGET}-g++ not available yet. We avoid diff --git a/sys-libs/glibc/glibc-2.39-r2.ebuild b/sys-libs/glibc/glibc-2.39-r2.ebuild index 7624666b6723..ab73ae4098aa 100644 --- a/sys-libs/glibc/glibc-2.39-r2.ebuild +++ b/sys-libs/glibc/glibc-2.39-r2.ebuild @@ -594,7 +594,7 @@ setup_env() { # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. export glibc__ORIG_CC=${CC} export glibc__ORIG_CXX=${CXX} - export glibc__ORIG_CPP="${CPP}" + export glibc__ORIG_CPP=${CPP} if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then export glibc__force_gcc=yes diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 5a0caff2e597..c6fc206e2d4f 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -589,10 +589,12 @@ setup_env() { # Reset CC and CXX to the value at start of emerge export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}} # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. export glibc__ORIG_CC=${CC} export glibc__ORIG_CXX=${CXX} + export glibc__ORIG_CPP=${CPP} if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then export glibc__force_gcc=yes @@ -641,6 +643,7 @@ setup_env() { export CC="$(tc-getCC ${CTARGET})" export CXX="$(tc-getCXX ${CTARGET})" + export CPP="$(tc-getCPP ${CTARGET})" # Always use tuple-prefixed toolchain. For non-native ABI glibc's configure # can't detect them automatically due to ${CHOST} mismatch and fallbacks @@ -657,6 +660,7 @@ setup_env() { # acts on CC?) export glibc__GLIBC_CC=${CC} export glibc__GLIBC_CXX=${CXX} + export glibc__GLIBC_CPP=${CPP} export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" @@ -672,6 +676,8 @@ setup_env() { # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" + if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time # with ${CTARGET}-g++ not available yet. We avoid
