From: Andreas K. Hüttel <dilfridge@gentoo.org>
Date: Sat, 20 Jan 2018 18:12:20 +0000 (+0100)
Subject: sys-libs/glibc: Do not check for IA32 abi when merging binary package
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c865354644b43a2f36c3feb5aba5ca60a4e179f9;p=gentoo.git

sys-libs/glibc: Do not check for IA32 abi when merging binary package

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 224a4f232d08..87549b89f6db 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -640,7 +640,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 
-		if use amd64 && use multilib ; 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"