diff options
| author |   Xake <xake@rymdraket.net> | 2009-10-20 19:09:55 +0200 |
|---|---|---|
| committer | Xake <xake@rymdraket.net> | 2009-10-20 19:09:55 +0200 |
| commit | 46881163c1f4ff9bc0bea42fb5fc24bc3ddea1ae (patch) | |
| tree | 55ef62d796d92bb5ab766df9b5a8546935100649 /eclass/toolchain.eclass | |
| parent | update for minor bug fixes. (diff) | |
| download | hardened-dev-46881163c1f4ff9bc0bea42fb5fc24bc3ddea1ae.tar.gz hardened-dev-46881163c1f4ff9bc0bea42fb5fc24bc3ddea1ae.tar.bz2 hardened-dev-46881163c1f4ff9bc0bea42fb5fc24bc3ddea1ae.zip | |
Updating eclasses against portage
(Portage version: 2.2_rc46/git/Linux x86_64)
(Unsigned Manifest commit)
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 2bffb57e..dcd17df2 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.407 2009/09/08 02:48:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.410 2009/10/19 01:49:36 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -79,10 +79,12 @@ if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then PRERELEASE=${GCC_PV/_pre/-} fi # make _alpha and _beta ebuilds automatically use a snapshot -if [[ ${GCC_PV} != ${GCC_PV/_alpha/} ]] ; then +if [[ ${GCC_PV} == *_alpha* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha} -elif [[ ${GCC_PV} != ${GCC_PV/_beta/} ]] ; then +elif [[ ${GCC_PV} == *_beta* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta} +elif [[ ${GCC_PV} == *_rc* ]] ; then + SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} fi export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} @@ -2550,8 +2552,8 @@ disable_multilib_libjava() { fix_libtool_libdir_paths() { pushd "${D}" >/dev/null - pushd "${1}" >/dev/null - local dir="${PWD#${D}}" + pushd "./${1}" >/dev/null + local dir="${PWD#${D%/}}" local allarchives=$(echo *.la) allarchives="\(${allarchives// /\\|}\)" popd >/dev/null |