commit: 231dfc565596f427a5966a27c6fe85c5bdf105ea Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Sep 11 18:55:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 11 19:35:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231dfc56
sys-libs/glibc: Ignore multilib check when cross-compiling is_crosscompile only covers the case where the libc is being built for a cross compiler (CHOST != CTARGET), but not the case when it's built *with* a cross compiler (CBUILD != CHOST). Closes: https://bugs.gentoo.org/962756 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43746 Closes: https://github.com/gentoo/gentoo/pull/43746 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-2.19-r3.ebuild | 2 +- sys-libs/glibc/glibc-2.31-r7.ebuild | 2 +- 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, 16 insertions(+), 16 deletions(-) diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild index 264c7d9cd8d9..fab08ccee3d7 100644 --- a/sys-libs/glibc/glibc-2.19-r3.ebuild +++ b/sys-libs/glibc/glibc-2.19-r3.ebuild @@ -616,7 +616,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild index 2e851bee538b..f2bd6ed5f57f 100644 --- a/sys-libs/glibc/glibc-2.31-r7.ebuild +++ b/sys-libs/glibc/glibc-2.31-r7.ebuild @@ -652,7 +652,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild index d535aadef06c..af4e11bbe6c6 100644 --- a/sys-libs/glibc/glibc-2.32-r8.ebuild +++ b/sys-libs/glibc/glibc-2.32-r8.ebuild @@ -669,7 +669,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild index ec11b1259eec..9f39707962a5 100644 --- a/sys-libs/glibc/glibc-2.33-r14.ebuild +++ b/sys-libs/glibc/glibc-2.33-r14.ebuild @@ -738,7 +738,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild index 8ba83a7c9a07..1370c1eb091a 100644 --- a/sys-libs/glibc/glibc-2.34-r14.ebuild +++ b/sys-libs/glibc/glibc-2.34-r14.ebuild @@ -747,7 +747,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild index 24202484ed3f..6cb4ddc4f200 100644 --- a/sys-libs/glibc/glibc-2.35-r11.ebuild +++ b/sys-libs/glibc/glibc-2.35-r11.ebuild @@ -766,7 +766,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild index 404dd8fe70a7..3130270d4bfb 100644 --- a/sys-libs/glibc/glibc-2.36-r8.ebuild +++ b/sys-libs/glibc/glibc-2.36-r8.ebuild @@ -797,7 +797,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.37-r10.ebuild b/sys-libs/glibc/glibc-2.37-r10.ebuild index 5b14810e718f..e286418263d9 100644 --- a/sys-libs/glibc/glibc-2.37-r10.ebuild +++ b/sys-libs/glibc/glibc-2.37-r10.ebuild @@ -806,7 +806,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild index 284c65b37631..a6f7a6b61394 100644 --- a/sys-libs/glibc/glibc-2.38-r13.ebuild +++ b/sys-libs/glibc/glibc-2.38-r13.ebuild @@ -817,7 +817,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.39-r11.ebuild b/sys-libs/glibc/glibc-2.39-r11.ebuild index cc7b5b54c664..c9a6c1b77dee 100644 --- a/sys-libs/glibc/glibc-2.39-r11.ebuild +++ b/sys-libs/glibc/glibc-2.39-r11.ebuild @@ -838,7 +838,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.40-r11.ebuild b/sys-libs/glibc/glibc-2.40-r11.ebuild index c0e2dbee7d1f..8b2a720f5e2c 100644 --- a/sys-libs/glibc/glibc-2.40-r11.ebuild +++ b/sys-libs/glibc/glibc-2.40-r11.ebuild @@ -818,7 +818,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.41-r5.ebuild b/sys-libs/glibc/glibc-2.41-r5.ebuild index 907d4d3a3fee..1d993f597bf7 100644 --- a/sys-libs/glibc/glibc-2.41-r5.ebuild +++ b/sys-libs/glibc/glibc-2.41-r5.ebuild @@ -821,7 +821,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.41-r6.ebuild b/sys-libs/glibc/glibc-2.41-r6.ebuild index d923dcf98dbc..9193fb2c4d5f 100644 --- a/sys-libs/glibc/glibc-2.41-r6.ebuild +++ b/sys-libs/glibc/glibc-2.41-r6.ebuild @@ -821,7 +821,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.42-r1.ebuild b/sys-libs/glibc/glibc-2.42-r1.ebuild index 45f6bc979c5f..c455f78066c6 100644 --- a/sys-libs/glibc/glibc-2.42-r1.ebuild +++ b/sys-libs/glibc/glibc-2.42-r1.ebuild @@ -817,7 +817,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-2.42.ebuild b/sys-libs/glibc/glibc-2.42.ebuild index 0fa1b9cf53da..818668f85ccf 100644 --- a/sys-libs/glibc/glibc-2.42.ebuild +++ b/sys-libs/glibc/glibc-2.42.ebuild @@ -817,7 +817,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index eddc446e9d54..f20b32407f22 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -817,7 +817,7 @@ sanity_prechecks() { # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... - if ! is_crosscompile ; then + if ! is_crosscompile && ! tc-is-cross-compiler ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
