diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-10-17 04:02:50 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-10-17 04:02:50 +0000 |
| commit | ae5d497ba4b0608b4eb1192de61d5c4bb310c788 (patch) | |
| tree | 6a5a3b7b671189515b06e75d0eb3adb111dc6f33 /eclass/toolchain.eclass | |
| parent | Remove old. (diff) | |
| download | gentoo-2-ae5d497ba4b0608b4eb1192de61d5c4bb310c788.tar.gz gentoo-2-ae5d497ba4b0608b4eb1192de61d5c4bb310c788.tar.bz2 gentoo-2-ae5d497ba4b0608b4eb1192de61d5c4bb310c788.zip | |
handle the new gcc-5.x snapshots which changed their versioning slightly
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index c168458f72ac..48e6f1e6ac03 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -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/eclass/toolchain.eclass,v 1.636 2014/10/17 02:48:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.637 2014/10/17 04:02:50 vapier Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -77,12 +77,9 @@ GCCMICRO=$(get_version_component_range 3 ${GCC_PV}) GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})} # Pre-release support -if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then +if [[ ${GCC_PV} == *_pre* ]] ; then PRERELEASE=${GCC_PV/_pre/-} -fi - -# make _alpha and _beta ebuilds automatically use a snapshot -if [[ ${GCC_PV} == *_alpha* ]] ; then +elif [[ ${GCC_PV} == *_alpha* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha} elif [[ ${GCC_PV} == *_beta* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta} @@ -90,6 +87,11 @@ elif [[ ${GCC_PV} == *_rc* ]] ; then SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} fi +if [[ ${SNAPSHOT} == 5.0.0-* ]] ; then + # The gcc-5 release has dropped the .0 for some reason. + SNAPSHOT=${SNAPSHOT/5.0.0/5} +fi + export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} PREFIX=${TOOLCHAIN_PREFIX:-/usr} |