gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-08 18:27:07 -08:00
Code Issues Projects Releases Wiki Activity

sys-libs/glibc: restore ability to switch single->multiple ABIs

Browse Source 
To recover broken system automatically from bug #646424
we need to skip IA32 ABI checks as those require multiabi
glibc checks at glibc build time.

There is no need to impose it as a requirement. Fail test
only if it compiled successfully and failed at runtime.

Bug: https://bugs.gentoo.org/326693
Bug: https://bugs.gentoo.org/646424
Package-Manager: Portage-2.3.20, Repoman-2.3.6
This commit is contained in:
Sergei Trofimovich
2018-02-03 01:38:38 +00:00
parent cb46887f4a
commit 2b297eb4b3
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys-libs/glibc/glibc-2.27-r1.ebuild
+10 -4
View File
@@ -648,13 +648,19 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# 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"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
"${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"
"${T}/check-ia32-emulation.elf32"
local STAT=$?
local STAT
if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
"${T}/check-ia32-emulation.elf32"
STAT=$?
else
# Don't fail here to allow single->multi ABI switch
# or recover from breakage like bug #646424
ewarn "Failed to compile the ABI test. Broken host glibc?"
STAT=0
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."
sys-libs/glibc/glibc-9999.ebuild
+10 -4
View File
@@ -648,13 +648,19 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# 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"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
"${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"
"${T}/check-ia32-emulation.elf32"
local STAT=$?
local STAT
if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
"${T}/check-ia32-emulation.elf32"
STAT=$?
else
# Don't fail here to allow single->multi ABI switch
# or recover from breakage like bug #646424
ewarn "Failed to compile the ABI test. Broken host glibc?"
STAT=0
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."