diff options
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c02872d39ad8..9992bd1c0988 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.163 2012/03/10 20:01:05 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.164 2012/03/10 20:48:22 dirtyepic Exp $ + + 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Revert PRERELEASE setting for live ebuilds. It seems 4.7 treats BASE-VER + differently than earlier versions. This fixes them, but breaks 4.7 again. 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() diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index dd2ecb355d47..4b7f649696a4 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.527 2012/03/10 20:01:05 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.528 2012/03/10 20:48:22 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -60,7 +60,7 @@ 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/-} && ${GCC_PV} != *9999* ]] ; then +if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then PRERELEASE=${GCC_PV/_pre/-} fi # make _alpha and _beta ebuilds automatically use a snapshot @@ -720,7 +720,11 @@ do_gcc_rename_java_bins() { toolchain_src_unpack() { [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc" - [[ ${PV} == *9999* ]] && git-2_src_unpack || gcc_quick_unpack + if [[ ${PV} == *9999* ]]; then + git-2_src_unpack + else + gcc_quick_unpack + fi export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" cd "${S}" |