commit: e42b5e276bc733f288e24b04ad230826cde1f2b0 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Sep 11 18:35:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 11 18:42:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42b5e27
sys-libs/glibc: Don't cause accidental CFLAGS_x86=$CFLAGS Because only the filter-flags command was called with CFLAGS=$CFLAGS_x86, the subshell's CFLAGS aren't modified, so the "echo" command outputs the original CFLAGS variable, overriding whatever was in CFLAGS_x86 previously. This could cause compilation issues. Closes: https://bugs.gentoo.org/962634 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43745 Closes: https://github.com/gentoo/gentoo/pull/43745 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-2.19-r3.ebuild | 4 ++-- sys-libs/glibc/glibc-2.31-r7.ebuild | 4 ++-- sys-libs/glibc/glibc-2.32-r8.ebuild | 2 +- sys-libs/glibc/glibc-2.33-r14.ebuild | 2 +- sys-libs/glibc/glibc-2.34-r14.ebuild | 2 +- sys-libs/glibc/glibc-2.35-r11.ebuild | 2 +- sys-libs/glibc/glibc-2.36-r8.ebuild | 2 +- sys-libs/glibc/glibc-2.37-r10.ebuild | 2 +- sys-libs/glibc/glibc-2.38-r13.ebuild | 2 +- sys-libs/glibc/glibc-2.39-r11.ebuild | 2 +- sys-libs/glibc/glibc-2.40-r11.ebuild | 2 +- sys-libs/glibc/glibc-2.41-r5.ebuild | 2 +- sys-libs/glibc/glibc-2.41-r6.ebuild | 2 +- sys-libs/glibc/glibc-2.42-r1.ebuild | 2 +- sys-libs/glibc/glibc-2.42.ebuild | 2 +- sys-libs/glibc/glibc-9999.ebuild | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild index 275cfa3d70e9..264c7d9cd8d9 100644 --- a/sys-libs/glibc/glibc-2.19-r3.ebuild +++ b/sys-libs/glibc/glibc-2.19-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -250,7 +250,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404" fi diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild index 8ec824d2fdcc..2e851bee538b 100644 --- a/sys-libs/glibc/glibc-2.31-r7.ebuild +++ b/sys-libs/glibc/glibc-2.31-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -293,7 +293,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild index 00494e772e76..d535aadef06c 100644 --- a/sys-libs/glibc/glibc-2.32-r8.ebuild +++ b/sys-libs/glibc/glibc-2.32-r8.ebuild @@ -310,7 +310,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild index ca9887c213e1..ec11b1259eec 100644 --- a/sys-libs/glibc/glibc-2.33-r14.ebuild +++ b/sys-libs/glibc/glibc-2.33-r14.ebuild @@ -322,7 +322,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild index 01e669ada882..8ba83a7c9a07 100644 --- a/sys-libs/glibc/glibc-2.34-r14.ebuild +++ b/sys-libs/glibc/glibc-2.34-r14.ebuild @@ -317,7 +317,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild index 41ccf67b46f0..24202484ed3f 100644 --- a/sys-libs/glibc/glibc-2.35-r11.ebuild +++ b/sys-libs/glibc/glibc-2.35-r11.ebuild @@ -329,7 +329,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild index 7d4230b04c8b..404dd8fe70a7 100644 --- a/sys-libs/glibc/glibc-2.36-r8.ebuild +++ b/sys-libs/glibc/glibc-2.36-r8.ebuild @@ -331,7 +331,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.37-r10.ebuild b/sys-libs/glibc/glibc-2.37-r10.ebuild index 663917fe7b24..5b14810e718f 100644 --- a/sys-libs/glibc/glibc-2.37-r10.ebuild +++ b/sys-libs/glibc/glibc-2.37-r10.ebuild @@ -346,7 +346,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild index cb526b527c0b..284c65b37631 100644 --- a/sys-libs/glibc/glibc-2.38-r13.ebuild +++ b/sys-libs/glibc/glibc-2.38-r13.ebuild @@ -347,7 +347,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.39-r11.ebuild b/sys-libs/glibc/glibc-2.39-r11.ebuild index 9e2c791858a9..cc7b5b54c664 100644 --- a/sys-libs/glibc/glibc-2.39-r11.ebuild +++ b/sys-libs/glibc/glibc-2.39-r11.ebuild @@ -363,7 +363,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.40-r11.ebuild b/sys-libs/glibc/glibc-2.40-r11.ebuild index b0bd6eb17b54..c0e2dbee7d1f 100644 --- a/sys-libs/glibc/glibc-2.40-r11.ebuild +++ b/sys-libs/glibc/glibc-2.40-r11.ebuild @@ -343,7 +343,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.41-r5.ebuild b/sys-libs/glibc/glibc-2.41-r5.ebuild index c2f1d01f0f05..907d4d3a3fee 100644 --- a/sys-libs/glibc/glibc-2.41-r5.ebuild +++ b/sys-libs/glibc/glibc-2.41-r5.ebuild @@ -350,7 +350,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.41-r6.ebuild b/sys-libs/glibc/glibc-2.41-r6.ebuild index 5a66a3bc9a83..d923dcf98dbc 100644 --- a/sys-libs/glibc/glibc-2.41-r6.ebuild +++ b/sys-libs/glibc/glibc-2.41-r6.ebuild @@ -350,7 +350,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.42-r1.ebuild b/sys-libs/glibc/glibc-2.42-r1.ebuild index ffcbc6a34bcb..45f6bc979c5f 100644 --- a/sys-libs/glibc/glibc-2.42-r1.ebuild +++ b/sys-libs/glibc/glibc-2.42-r1.ebuild @@ -351,7 +351,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-2.42.ebuild b/sys-libs/glibc/glibc-2.42.ebuild index 703f08dd6966..0fa1b9cf53da 100644 --- a/sys-libs/glibc/glibc-2.42.ebuild +++ b/sys-libs/glibc/glibc-2.42.ebuild @@ -351,7 +351,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 0e65d86c7909..eddc446e9d54 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -351,7 +351,7 @@ setup_target_flags() { [[ ${t} == "x86_64" ]] && t="x86-64" filter-flags '-march=*' # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}") export CFLAGS_x86="${CFLAGS_x86} -march=${t}" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi
