diff options
Diffstat (limited to 'hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild')
| -rw-r--r-- | hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild index 0d9e50a..5a03986 100644 --- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild +++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.35 2007/02/17 00:29:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.38 2007/03/01 02:21:06 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -16,7 +16,7 @@ # CHOST = CTARGET - install into / # CHOST != CTARGET - install into /usr/CTARGET/ -KEYWORDS="-* alpha amd64 arm ia64 ppc ppc64 sh sparc x86" +KEYWORDS="-* alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86" BRANCH_UPDATE="" @@ -303,9 +303,9 @@ toolchain-glibc_headers_compile() { toolchain-glibc_src_test() { cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1" unset LD_ASSUME_KERNEL - make check && return - einfo "make check failed - re-running with --ignore-errors to get the rest of the results." - make --ignore-errors check + make check && return 0 + einfo "make check failed - re-running with --keep-going to get the rest of the results." + make -k check ewarn "make check failed for ${ABI}-${CTARGET}-$1" return 1 } @@ -720,10 +720,6 @@ setup_flags() { CBUILD_OPT=${CTARGET_OPT} fi - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - # Lock glibc at -O2 -- linuxthreads needs it and we want to be # conservative here. -fno-strict-aliasing is to work around #155906 filter-flags -O? @@ -1184,6 +1180,8 @@ src_compile() { } src_test() { + local ret=0 + setup_env if [[ -z ${OABI} ]] && has_multilib_profile ; then @@ -1193,20 +1191,18 @@ src_test() { export ABI einfo " Testing ${ABI} glibc" src_test + ((ret+=$?)) done ABI=${OABI} unset OABI - return 0 + [[ ${ret} -ne 0 ]] \ + && die "tests failed" \ + || return 0 fi - local ok=0 - if want_linuxthreads; then - toolchain-glibc_src_test linuxthreads || ok=1 - fi - if want_nptl; then - toolchain-glibc_src_test nptl || ok=1 - fi - [[ ${ok} == "0" ]] || die "Tests did not all pass :(" + want_linuxthreads && toolchain-glibc_src_test linuxthreads ; ((ret+=$?)) + want_nptl && toolchain-glibc_src_test nptl ; ((ret+=$?)) + return ${ret} } src_strip() { |