[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Andreas Hüttel]

commit:     c865354644b43a2f36c3feb5aba5ca60a4e179f9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 18:12:20 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 18:13:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8653546

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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-libs/glibc/glibc-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 224a4f232d0..87549b89f6d 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"