avoid eclass recursion

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 96150f87b851d556d99566862cdcea2a5c007962..9c645a4991d9a8ee1475e218aa4bf780248e6d04 100644 (file)
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,15 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.59 2007/03/27 01:34:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.60 2007/03/27 01:46:50 vapier Exp $
 #
 # Maintainer: amd64@gentoo.org / toolchain@gentoo.org
 #
 # This eclass is for all functions pertaining to handling multilib.
 # configurations.
 
-DESCRIPTION="Based on the ${ECLASS} eclass"
+___ECLASS_RECUR_MULTILIB="yes"
+[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
 
-#inherit toolchain-funcs # cant do this because it includes us
+DESCRIPTION="Based on the ${ECLASS} eclass"
 
 # has_multilib_profile:
 # Return true if the current profile is a multilib profile and lists more than

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index c3e8bd6d1273cca8cf461888e877354ffd2c6610..851065fe1adf7fd40cd1b44a61b495fcc69cf92f 100644 (file)
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,13 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.68 2007/03/15 15:55:59 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.69 2007/03/27 01:46:50 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 #
 # This eclass contains (or should) functions to get common info
 # about the toolchain (libc/compiler/binutils/etc...)
 
-inherit multilib
+___ECLASS_RECUR_TOOLCHAIN_FUNCS="yes"
+[[ -z ${___ECLASS_RECUR_MULTILIB} ]] && inherit multilib
 
 DESCRIPTION="Based on the ${ECLASS} eclass"