diff options
| author |   Zorry <zorry.at.ume.nu> | 2009-08-10 04:52:07 +0200 |
|---|---|---|
| committer | Zorry <zorry.at.ume.nu> | 2009-08-10 04:52:07 +0200 |
| commit | 6e98629e6762d5f589749c2923a6846df302c66f (patch) | |
| tree | de19d283a57b41947de6faa66f7c435a23e8eb1f | |
| parent | Updaded espf to 0.3.2 and added gcc 4.3.4 (diff) | |
| download | hardened-dev-6e98629e6762d5f589749c2923a6846df302c66f.tar.gz hardened-dev-6e98629e6762d5f589749c2923a6846df302c66f.tar.bz2 hardened-dev-6e98629e6762d5f589749c2923a6846df302c66f.zip | |
eclass/toolchain.eclass updated to 1.403
| -rw-r--r-- | eclass/toolchain.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 8e83547c..853a4591 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.402 2009/07/05 19:56:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.4023 2009/07/26 20:09:59 halcyOn Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -513,14 +513,14 @@ want_minispecs() { if tc_version_is_at_least 4.3.2 && use hardened ; then [[ -n ${SPECS_VER} ]] && want_pie && return 0 [[ -n ${ESPF_VER} ]] && [[ -n ${SPECS_VER} ]] && return 1 - die "For Hardend to work you need the minispecs files and have the PIE patch" + die "For Hardened to work you need the minispecs files and have the PIE patch" fi return 1 } want_espf() { if tc_version_is_at_least 4.4.0 && use hardened ; then [[ -n ${ESPF_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0 - die "For Hardend to work you need the specs files and have the espf patch" + die "For Hardened to work you need the minispecs files and have the espf patch" fi return 1 } @@ -2281,7 +2281,7 @@ do_gcc_PIE_patches() { && rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \ || rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-yes.patch* - use vanilla && rm -f "${WORKDIR}"/piepatch/*/*uclibc* + use vanilla && return 0 if tc_version_is_at_least 4.3.2; then guess_patch_type_in_dir "${WORKDIR}"/piepatch/ @@ -2312,7 +2312,7 @@ do_gcc_PIE_patches() { # do various updates to ESPF do_gcc_ESPF_patches() { - if [[ -n ${ESPF_VER} ]] ; then + if [[ -n ${ESPF_VER} ]] || ! use vanilla; then guess_patch_type_in_dir "${WORKDIR}"/espf-gcc-"${GCC_RELEASE_VER}" EPATCH_MULTI_MSG="Applying espf patches ..." \ epatch "${WORKDIR}"/espf-gcc-"${GCC_RELEASE_VER}" |