diff options
| -rw-r--r-- | eclass/multilib.eclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 1d950f6e..4733c83e 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.105 2014/01/17 07:44:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -10,8 +10,8 @@ # @DESCRIPTION: # This eclass is for all functions pertaining to handling multilib configurations. -if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank" +if [[ -z ${_MULTILIB_ECLASS} ]]; then +_MULTILIB_ECLASS=1 inherit toolchain-funcs @@ -22,7 +22,7 @@ export CFLAGS_default export LDFLAGS_default export CHOST_default=${CHOST_default:-${CHOST}} export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} -export LIBDIR_default=${CONF_LIBDIR:-"lib"} +export LIBDIR_default=${CONF_LIBDIR:-${LIBDIR_x86:-"lib"}} export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} # @FUNCTION: has_multilib_profile @@ -414,13 +414,13 @@ multilib_toolchain_setup() { export ABI=$1 # First restore any saved state we have laying around. - if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then + if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do - vv="__abi_saved_${v}" + vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} done - unset __DEFAULT_ABI_SAVED + unset _DEFAULT_ABI_SAVED fi # We want to avoid the behind-the-back magic of gcc-config as it @@ -428,10 +428,10 @@ multilib_toolchain_setup() { if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do - vv="__abi_saved_${v}" + vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done - export __DEFAULT_ABI_SAVED="true" + export _DEFAULT_ABI_SAVED="true" # Set the CHOST native first so that we pick up the native # toolchain and not a cross-compiler by accident #202811. |