diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2012-03-10 19:32:33 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2012-03-10 19:32:33 +0000 |
| commit | 62bdf0526ae8e8c59dff60492ceb3716309f75f4 (patch) | |
| tree | 745e86bf1a8f56ede905e12a9db84043f33c5caa /eclass | |
| parent | Restrict *-jython as per comment from Arfrever. (diff) | |
| download | historical-62bdf0526ae8e8c59dff60492ceb3716309f75f4.tar.gz historical-62bdf0526ae8e8c59dff60492ceb3716309f75f4.tar.bz2 historical-62bdf0526ae8e8c59dff60492ceb3716309f75f4.zip | |
Tweak live ebuild bits.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9dcd09d82f7e..9b9f2f6768fd 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.161 2012/03/10 17:49:56 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.162 2012/03/10 19:32:33 dirtyepic Exp $ + + 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Tweak live ebuild bits. 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: Fix unpacking of live git ebuilds. diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index f8e0e7cf5c0c..c16d8f877b36 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.525 2012/03/10 17:49:56 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.526 2012/03/10 19:32:33 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" # naming style: # gcc-9999 -> master - # gcc-4.7_pre9999 -> 4.7 branch + # gcc-4.7_pre9999 -> gcc-4_7-branch if [[ ${PV} == *_pre9999* ]] ; then EGIT_BRANCH="${PN}-${PV%_pre9999}-branch" EGIT_BRANCH=${EGIT_BRANCH//./_} @@ -189,6 +189,8 @@ S=$( echo ${WORKDIR}/gcc-${PRERELEASE} elif [[ -n ${SNAPSHOT} ]] ; then echo ${WORKDIR}/gcc-${SNAPSHOT} + elif [[ ${GCC_PV} == *9999* ]] ; then + echo ${WORKDIR}/${P} else echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} fi @@ -714,14 +716,11 @@ do_gcc_rename_java_bins() { done } toolchain_src_unpack() { - [[ ${PV} == *9999* ]] && git-2_src_unpack - - export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" - [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc" - gcc_quick_unpack + [[ ${PV} == *9999* ]] && git-2_src_unpack || gcc_quick_unpack + export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" cd "${S}" if ! use vanilla ; then @@ -764,7 +763,7 @@ toolchain_src_unpack() { gcc_version_patch if tc_version_is_at_least 4.1 ; then - if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} || -n ${GCC_SVN} ]] ; then + if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then echo ${PV/_/-} > "${S}"/gcc/BASE-VER fi fi |