From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A7D2158004 for ; Wed, 26 Jun 2024 14:59:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B9EE2A43; Wed, 26 Jun 2024 14:59:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3790E2A43 for ; Wed, 26 Jun 2024 14:59:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92226340BEA for ; Wed, 26 Jun 2024 14:59:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E86681CF7 for ; Wed, 26 Jun 2024 14:59:46 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1719413780.051caa38b6eeb4e05e8a7dc4ba9e3b3d41ae3ba3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.19-r3.ebuild sys-libs/glibc/glibc-2.31-r7.ebuild sys-libs/glibc/glibc-2.32-r8.ebuild sys-libs/glibc/glibc-2.33-r14.ebuild sys-libs/glibc/glibc-2.34-r14.ebuild sys-libs/glibc/glibc-2.35-r11.ebuild sys-libs/glibc/glibc-2.36-r8.ebuild sys-libs/glibc/glibc-2.37-r10.ebuild sys-libs/glibc/glibc-2.38-r13.ebuild sys-libs/glibc/glibc-2.39-r6.ebuild sys-libs/glibc/glibc-2.39-r7.ebuild sys-libs/glibc/glibc-2.39-r9.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 051caa38b6eeb4e05e8a7dc4ba9e3b3d41ae3ba3 X-VCS-Branch: master Date: Wed, 26 Jun 2024 14:59:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b34f9a28-7078-4490-a470-0ee92e56eb62 X-Archives-Hash: 187a688764f036ae7d54f4e53ea2eb50 commit: 051caa38b6eeb4e05e8a7dc4ba9e3b3d41ae3ba3 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 25 15:01:39 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 26 14:56:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051caa38 sys-libs/glibc: improve amd64 multilib message Closes: https://bugs.gentoo.org/934391 Signed-off-by: Mike Gilbert gentoo.org> sys-libs/glibc/glibc-2.19-r3.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.31-r7.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.32-r8.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.33-r14.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.34-r14.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.35-r11.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.36-r8.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.37-r10.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.38-r13.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.39-r6.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.39-r7.ebuild | 8 ++++++-- sys-libs/glibc/glibc-2.39-r9.ebuild | 8 ++++++-- sys-libs/glibc/glibc-9999.ebuild | 8 ++++++-- 13 files changed, 78 insertions(+), 26 deletions(-) diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild index 4098211ce0aa..06c7071e8efb 100644 --- a/sys-libs/glibc/glibc-2.19-r3.ebuild +++ b/sys-libs/glibc/glibc-2.19-r3.ebuild @@ -612,7 +612,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -626,7 +626,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild index 2625a376cfa0..e531ada0b011 100644 --- a/sys-libs/glibc/glibc-2.31-r7.ebuild +++ b/sys-libs/glibc/glibc-2.31-r7.ebuild @@ -649,7 +649,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -663,7 +663,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild index 977997ef0840..65aa84f364aa 100644 --- a/sys-libs/glibc/glibc-2.32-r8.ebuild +++ b/sys-libs/glibc/glibc-2.32-r8.ebuild @@ -666,7 +666,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -680,7 +680,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild index a9012e350120..9119534902f5 100644 --- a/sys-libs/glibc/glibc-2.33-r14.ebuild +++ b/sys-libs/glibc/glibc-2.33-r14.ebuild @@ -733,7 +733,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -747,7 +747,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild index 9d92b5e3783f..1affa01b9a4d 100644 --- a/sys-libs/glibc/glibc-2.34-r14.ebuild +++ b/sys-libs/glibc/glibc-2.34-r14.ebuild @@ -742,7 +742,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -756,7 +756,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild index 86a7d2673b22..0c63dac54d10 100644 --- a/sys-libs/glibc/glibc-2.35-r11.ebuild +++ b/sys-libs/glibc/glibc-2.35-r11.ebuild @@ -761,7 +761,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -775,7 +775,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild index caac3e58f9b6..b8bf8d174f36 100644 --- a/sys-libs/glibc/glibc-2.36-r8.ebuild +++ b/sys-libs/glibc/glibc-2.36-r8.ebuild @@ -792,7 +792,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -806,7 +806,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.37-r10.ebuild b/sys-libs/glibc/glibc-2.37-r10.ebuild index 53335dbbd2f7..84368cf8f50f 100644 --- a/sys-libs/glibc/glibc-2.37-r10.ebuild +++ b/sys-libs/glibc/glibc-2.37-r10.ebuild @@ -801,7 +801,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -815,7 +815,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild index 1de5a90ac29b..3ff40e502358 100644 --- a/sys-libs/glibc/glibc-2.38-r13.ebuild +++ b/sys-libs/glibc/glibc-2.38-r13.ebuild @@ -812,7 +812,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -826,7 +826,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.39-r6.ebuild b/sys-libs/glibc/glibc-2.39-r6.ebuild index d4820cc75723..25ea3a7768f3 100644 --- a/sys-libs/glibc/glibc-2.39-r6.ebuild +++ b/sys-libs/glibc/glibc-2.39-r6.ebuild @@ -837,7 +837,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -851,7 +851,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.39-r7.ebuild b/sys-libs/glibc/glibc-2.39-r7.ebuild index 90f211bebf68..3e175b82b580 100644 --- a/sys-libs/glibc/glibc-2.39-r7.ebuild +++ b/sys-libs/glibc/glibc-2.39-r7.ebuild @@ -837,7 +837,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -851,7 +851,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-2.39-r9.ebuild b/sys-libs/glibc/glibc-2.39-r9.ebuild index da579ed2837b..d15adef9b01f 100644 --- a/sys-libs/glibc/glibc-2.39-r9.ebuild +++ b/sys-libs/glibc/glibc-2.39-r9.ebuild @@ -830,7 +830,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -844,7 +844,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index a1512de95b17..f6b2e565a6a6 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -830,7 +830,7 @@ sanity_prechecks() { # we test for... if ! is_crosscompile ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then - ebegin "Checking that IA32 emulation is enabled in the running kernel" + ebegin "Checking if the system can execute 32-bit binaries" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" local STAT if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then @@ -844,7 +844,11 @@ sanity_prechecks() { fi rm -f "${T}/check-ia32-emulation.elf32" eend $STAT - [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi fi fi