diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-10-17 17:30:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-10-17 17:30:04 +0000 |
| commit | 2d80411f473963be1e04086a7974cc9f8da0b96c (patch) | |
| tree | 248e7b7ee7080197176e5a94024fabc5171dcce9 /sys-libs/glibc/files | |
| parent | Add to KDE herd. (diff) | |
| download | gentoo-2-2d80411f473963be1e04086a7974cc9f8da0b96c.tar.gz gentoo-2-2d80411f473963be1e04086a7974cc9f8da0b96c.tar.bz2 gentoo-2-2d80411f473963be1e04086a7974cc9f8da0b96c.zip | |
Tweak nonfatal indirection for EAPI=0 to fix binpkg handling #523332 by Alex Efros.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/glibc/files')
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_setup.eblit | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index c42375cbe69b..0b902a4311a3 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.43 2014/09/18 16:48:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.44 2014/10/17 17:30:04 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} @@ -12,7 +12,10 @@ if [[ ${EAPI:-0} == [012] ]] ; then fi if [[ ${EAPI:-0} == [0123] ]] ; then nonfatal() { "$@" ; } + _nonfatal() { "$@" ; } fi +# This indirection is for binpkgs. #523332 +_nonfatal() { nonfatal "$@" ; } # We need to be able to set alternative headers for # compiling for non-native platform diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit index 9d678ff673c6..bd5b093d1088 100644 --- a/sys-libs/glibc/files/eblits/pkg_setup.eblit +++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.13 2014/09/17 22:53:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.14 2014/10/17 17:30:04 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -12,7 +12,7 @@ glibc_compile_test() { rm -f glibc-test* printf '%b' "$*" > glibc-test.c - nonfatal emake -s glibc-test + _nonfatal emake -s glibc-test ret=$? popd >/dev/null |