diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-12-31 08:39:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-31 08:39:30 +0000 |
| commit | 413ff8f601702b038206c42f30cee625e18de3a8 (patch) | |
| tree | d5a4c316ed20a19357f0d544a9abf4b982811f7e /eclass | |
| parent | Version bump as reported by Peter Simons via e-mail. (diff) | |
| download | gentoo-2-413ff8f601702b038206c42f30cee625e18de3a8.tar.gz gentoo-2-413ff8f601702b038206c42f30cee625e18de3a8.tar.bz2 gentoo-2-413ff8f601702b038206c42f30cee625e18de3a8.zip | |
add a sanity check to make sure ETYPE is set by ebuilds and make the GCC_A_FAKEIT setting more flexible (not all tarballs are tar.bz2)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a577da6625d7..d1b8b9a076a2 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.236 2005/12/29 03:06:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.237 2005/12/31 08:39:30 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -808,6 +808,8 @@ create_eselect_conf() { #---->> pkg_* <<---- gcc_pkg_setup() { + [[ -z ${ETYPE} ]] && die "Your ebuild needs to set the ETYPE variable" + if [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && ( ${LD_PRELOAD} == "/lib/libsandbox.so" || ${LD_PRELOAD} == "/usr/lib/libsandbox.so" ) ]] && is_multilib ; then eerror "Sandbox in your installed portage does not support compilation." eerror "of a multilib gcc. Please set FEATURES=-sandbox and try again." @@ -1716,7 +1718,7 @@ gcc_quick_unpack() { export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} if [[ -n ${GCC_A_FAKEIT} ]] ; then - unpack ${GCC_A_FAKEIT}.tar.bz2 + unpack ${GCC_A_FAKEIT} mv ${GCC_A_FAKEIT} "${S}" elif [[ -n ${PRERELEASE} ]] ; then unpack gcc-${PRERELEASE}.tar.bz2 |