diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2012-03-22 06:07:08 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2012-03-22 06:07:08 +0000 |
| commit | 8a1467bee33a849e0bf7642965ff2bc0bbb0a71f (patch) | |
| tree | ba63d70eea2e17604173d72204bb6ffcf9ee8b32 /eclass | |
| parent | Move gtk-doc documentation to /usr/share/doc/${PF}/html with symlink(s) back ... (diff) | |
| download | gentoo-2-8a1467bee33a849e0bf7642965ff2bc0bbb0a71f.tar.gz gentoo-2-8a1467bee33a849e0bf7642965ff2bc0bbb0a71f.tar.bz2 gentoo-2-8a1467bee33a849e0bf7642965ff2bc0bbb0a71f.zip | |
All ebuilds need a version number so drop special case for master. Update comments.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e2e3c2a6cf16..77568660aa02 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.177 2012/03/21 17:12:01 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.178 2012/03/22 06:07:08 dirtyepic Exp $ + + 22 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + All ebuilds need a version number so drop special case for master. Update + comments. 21 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> autotools.eclass: Go back to use a variable rather than an array for _LATEST_AUTOMAKE, use diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d312b168e76b..b5c0aa00cdb7 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.531 2012/03/15 20:18:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.532 2012/03/22 06:07:08 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -11,17 +11,15 @@ RESTRICT="strip" # cross-compilers need controlled stripping inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils -if [[ ${PV} == *9999* ]] ; then +if [[ ${PV} == *_pre9999* ]] ; then EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" # naming style: - # gcc-9999 -> master # 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. gcc/BASE-VER also requires it. - if [[ ${PV} == *_pre9999* ]] ; then - EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch" - EGIT_BRANCH=${EGIT_BRANCH//./_} - fi + # Note that the micro version is required or lots of stuff will break. + # To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before + # inheriting this eclass. + EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch" + EGIT_BRANCH=${EGIT_BRANCH//./_} inherit git-2 fi @@ -771,6 +769,8 @@ toolchain_src_unpack() { # BASE-VER must be a three-digit version number # followed by an optional -pre string # eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999 + # If BASE-VER differs from ${PV/_/-} then libraries get installed in + # the wrong directory. echo ${PV/_/-} > "${S}"/gcc/BASE-VER fi fi |