From 4439bf758dc2bfc1584f646c055ee54a1a6c2b43 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 23 Apr 2024 15:38:53 +0100 Subject: [PATCH] sys-libs/glibc: fix CPP definition On sparc, this might break if e.g. -mcpu is in CFLAGS. It's similar to the arm case already mentioned. Reported by Dakon: "ok, it greps for __sparc_v8 or __sparc_v9 cpp output, but it does not pass the -mcpu I have in CFLAGS, so it falls back to the compiler default which still is v7" Fixes: 30e32d9ed408fd786e9c1e16063c1228d123ebc1 Fixes: 39ba3e621469464a59dc7a37e3c41366d7856066 Signed-off-by: Sam James --- sys-libs/glibc/glibc-2.38-r12.ebuild | 2 +- sys-libs/glibc/glibc-2.39-r3.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-libs/glibc/glibc-2.38-r12.ebuild b/sys-libs/glibc/glibc-2.38-r12.ebuild index aef3c5d5d4799..88280475bb10c 100644 --- a/sys-libs/glibc/glibc-2.38-r12.ebuild +++ b/sys-libs/glibc/glibc-2.38-r12.ebuild @@ -663,7 +663,7 @@ 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}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild b/sys-libs/glibc/glibc-2.39-r3.ebuild index f53dac7811b76..1e6aadbb04e31 100644 --- a/sys-libs/glibc/glibc-2.39-r3.ebuild +++ b/sys-libs/glibc/glibc-2.39-r3.ebuild @@ -676,7 +676,7 @@ 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}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index c6fc206e2d4fd..c3dce15e7e996 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -676,7 +676,7 @@ 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}" + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" if is_crosscompile; then # Assume worst-case bootstrap: glibc is built for the first time