vapier 14/09/17 22:53:43 Modified: common.eblit src_test.eblit pkg_setup.eblit Log: Use `nonfatal` with emake when we check the return value ourselves #522962 by Manuel Lauss. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.42 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.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.41&r2=1.42 Index: common.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- common.eblit 10 Sep 2014 19:15:42 -0000 1.41 +++ common.eblit 17 Sep 2014 22:53:43 -0000 1.42 @@ -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.41 2014/09/10 19:15:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.42 2014/09/17 22:53:43 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} @@ -10,6 +10,9 @@ : ${ED:=${D}} : ${EROOT:=${ROOT}} fi +if [[ ${EAPI:-0} == [0123] ]] ; then + nonfatal() { "$@" ; } +fi # We need to be able to set alternative headers for # compiling for non-native platform 1.9 sys-libs/glibc/files/eblits/src_test.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?r1=1.8&r2=1.9 Index: src_test.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- src_test.eblit 10 Sep 2014 18:15:55 -0000 1.8 +++ src_test.eblit 17 Sep 2014 22:53:43 -0000 1.9 @@ -1,12 +1,12 @@ # 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/src_test.eblit,v 1.8 2014/09/10 18:15:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.9 2014/09/17 22:53:43 vapier Exp $ glibc_src_test() { cd "$(builddir $1)" - emake -j1 check && return 0 + nonfatal emake -j1 check && return 0 einfo "make check failed - re-running with --keep-going to get the rest of the results" - emake -j1 -k check + nonfatal emake -j1 -k check ewarn "make check failed for ${ABI}-${CTARGET}-$1" return 1 } 1.13 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.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.12&r2=1.13 Index: pkg_setup.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pkg_setup.eblit 14 Jun 2014 22:19:10 -0000 1.12 +++ pkg_setup.eblit 17 Sep 2014 22:53:43 -0000 1.13 @@ -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.12 2014/06/14 22:19:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.13 2014/09/17 22:53:43 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -12,7 +12,7 @@ rm -f glibc-test* printf '%b' "$*" > glibc-test.c - emake -s glibc-test + nonfatal emake -s glibc-test ret=$? popd >/dev/null
