From 4784d78b5d5fe2a7e555ea65e00ef9aad1d4ccc7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 27 Mar 2007 01:46:50 +0000 Subject: [PATCH] avoid eclass recursion --- eclass/multilib.eclass | 7 ++++--- eclass/toolchain-funcs.eclass | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 96150f87b851..9c645a4991d9 100644 --- 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 c3e8bd6d1273..851065fe1adf 100644 --- 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 # # 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" -- 2.26.2