diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2012-03-10 20:01:05 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2012-03-10 20:01:05 +0000 |
| commit | 4e5f2c52549db11d9bf51b13cfd52c50b605ac8b (patch) | |
| tree | 6f538b89807d63e95830271582fef20e24eca6e0 /eclass | |
| parent | Fix UTF-8 encoding of metadata.xml. (diff) | |
| download | gentoo-2-4e5f2c52549db11d9bf51b13cfd52c50b605ac8b.tar.gz gentoo-2-4e5f2c52549db11d9bf51b13cfd52c50b605ac8b.tar.bz2 gentoo-2-4e5f2c52549db11d9bf51b13cfd52c50b605ac8b.zip | |
We need micro versions on live ebuilds in order for tc_version_is_at_least() to work properly.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9b9f2f6768fd..c02872d39ad8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.162 2012/03/10 19:32:33 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.163 2012/03/10 20:01:05 dirtyepic Exp $ + + 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + We need micro versions on live ebuilds in order for tc_version_is_at_least() + to work properly. 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: Tweak live ebuild bits. diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index c16d8f877b36..dd2ecb355d47 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.526 2012/03/10 19:32:33 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.527 2012/03/10 20:01:05 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -15,9 +15,11 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" # naming style: # gcc-9999 -> master - # gcc-4.7_pre9999 -> gcc-4_7-branch + # gcc-4.7.1_pre9999 -> gcc-4_7-branch + # Note that we need the micro version in order for tc_version_is_at_least + # to work. if [[ ${PV} == *_pre9999* ]] ; then - EGIT_BRANCH="${PN}-${PV%_pre9999}-branch" + EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch" EGIT_BRANCH=${EGIT_BRANCH//./_} fi inherit git-2 |