vapier 14/10/17 17:30:04 Modified: common.eblit pkg_setup.eblit Log: 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)
Revision Changes Path 1.44 sys-libs/glibc/files/eblits/common.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.44&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.44&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.43&r2=1.44 Index: common.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- common.eblit 18 Sep 2014 16:48:15 -0000 1.43 +++ common.eblit 17 Oct 2014 17:30:04 -0000 1.44 @@ -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 @@ 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 1.14 sys-libs/glibc/files/eblits/pkg_setup.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.13&r2=1.14 Index: pkg_setup.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pkg_setup.eblit 17 Sep 2014 22:53:43 -0000 1.13 +++ pkg_setup.eblit 17 Oct 2014 17:30:04 -0000 1.14 @@ -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 @@ rm -f glibc-test* printf '%b' "$*" > glibc-test.c - nonfatal emake -s glibc-test + _nonfatal emake -s glibc-test ret=$? popd >/dev/null
