summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-10-12 19:01:31 +0000
committerMike Frysinger <vapier@gentoo.org>2009-10-12 19:01:31 +0000
commit5eaabd550db312fcc3e73bb5d61a9c805592491f (patch)
tree4f275e5dd2a80bd02fe12547f95b8628db939401 /eclass
parentToo long desc. Quoting. (diff)
downloadhistorical-5eaabd550db312fcc3e73bb5d61a9c805592491f.tar.gz
historical-5eaabd550db312fcc3e73bb5d61a9c805592491f.tar.bz2
historical-5eaabd550db312fcc3e73bb5d61a9c805592491f.zip
add support for _rc versions by Bruno Tsubouchi Yporti #288701 and tweak checking of GCC_PV in general
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 01ac977a5f38..bb7f3ffb3302 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.408 2009/10/12 19:01:31 vapier 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}}