diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-12-07 01:42:33 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-07 01:42:33 +0000 |
commit | 5f334685265245ed4b02f2bb73bb727bfe0be5b4 (patch) | |
tree | 5c8269c5f885e3346e9d66aa436c45549a88cd2b | |
parent | built_with_use() (diff) | |
download | historical-5f334685265245ed4b02f2bb73bb727bfe0be5b4.tar.gz historical-5f334685265245ed4b02f2bb73bb727bfe0be5b4.tar.bz2 historical-5f334685265245ed4b02f2bb73bb727bfe0be5b4.zip |
encode CTARGET into CATEGORY until portage can give us a proper SLOT solution
-rw-r--r-- | eclass/kernel.eclass | 7 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/eclass/kernel.eclass b/eclass/kernel.eclass index 21aa5d9eab46..70ca24f9bdb4 100644 --- a/eclass/kernel.eclass +++ b/eclass/kernel.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.53 2004/12/03 19:20:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.54 2004/12/07 01:42:33 vapier Exp $ # # This eclass contains the common functions to be used by all lostlogic # based kernel ebuilds @@ -14,6 +14,11 @@ ECLASS=kernel EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst export CTARGET="${CTARGET:-${CHOST}}" +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET="${CATEGORY/cross-}" + fi +fi HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" LICENSE="GPL-2" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 408f2daa4983..786c5023aacd 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.63 2004/12/07 00:09:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.64 2004/12/07 01:42:33 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" @@ -31,6 +31,11 @@ toolchain_pkg_setup() { #---->> globals <<---- export CTARGET="${CTARGET:-${CHOST}}" +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET="${CATEGORY/cross-}" + fi +fi MY_PV_FULL="$(get_version_component_range 1-3)" MY_PV="$(get_version_component_range 1-2)" |