diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-01-13 19:49:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-13 19:49:25 +0000 |
| commit | 10bb382530c8c8007c019225d5f535f753ee14f6 (patch) | |
| tree | e9615c93df65ba2661453a0b423b8333bade4259 /eclass | |
| parent | Add upstream fix for libdl checks in gold #347931 by Andreas Turriff. (diff) | |
| download | gentoo-2-10bb382530c8c8007c019225d5f535f753ee14f6.tar.gz gentoo-2-10bb382530c8c8007c019225d5f535f753ee14f6.tar.bz2 gentoo-2-10bb382530c8c8007c019225d5f535f753ee14f6.zip | |
namespace ECLASSDIR_LOCAL incase some other eclass tries to use the same var
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/libtool.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 0251d03500ff..42691ca53b88 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.109 2013/12/31 16:53:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.110 2014/01/13 19:49:25 vapier Exp $ # @ECLASS: libtool.eclass # @MAINTAINER: @@ -21,11 +21,11 @@ ___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank" # libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's # eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So # add a check to locate the ELT-patches/ regardless of what's going on. -ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} +_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} elt_patch_dir() { local d="${ECLASSDIR}/ELT-patches" if [[ ! -d ${d} ]] ; then - d="${ECLASSDIR_LOCAL}/ELT-patches" + d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" fi echo "${d}" } |