diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-07-11 08:21:58 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-07-11 08:21:58 +0000 |
| commit | fd09acbe8caeba968c7440f90995b39da742143d (patch) | |
| tree | 4ff02ad41c2fa38676fe63ef48f118aa7c90e450 /eclass/libtool.eclass | |
| parent | droped vdr use-flag, droped media-video/vdr from depend, droped useless servi... (diff) | |
| download | gentoo-2-fd09acbe8caeba968c7440f90995b39da742143d.tar.gz gentoo-2-fd09acbe8caeba968c7440f90995b39da742143d.tar.bz2 gentoo-2-fd09acbe8caeba968c7440f90995b39da742143d.zip | |
Avoid reserved names for functions and variables, bug 516092.
Diffstat (limited to 'eclass/libtool.eclass')
| -rw-r--r-- | eclass/libtool.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 030612ce4d70..a92db7640a90 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.111 2014/06/12 07:14:25 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.112 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: libtool.eclass # @MAINTAINER: @@ -14,8 +14,8 @@ # generated libtool files. We do not run the libtoolize program because that # requires a regeneration of the main autotool files in order to work properly. -if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank" +if [[ -z ${_LIBTOOL_ECLASS} ]]; then +_LIBTOOL_ECLASS=1 # If an overlay has eclass overrides, but doesn't actually override the # libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's @@ -43,8 +43,8 @@ ELT_try_and_apply_patch() { local disp="${src} patch" local log="${T}/elibtool.log" - if [[ -z ${__ELT_NOTED_TMP} ]] ; then - __ELT_NOTED_TMP=true + if [[ -z ${_ELT_NOTED_TMP} ]] ; then + _ELT_NOTED_TMP=true printf 'temp patch: %s\n' "${patch}" > "${log}" fi printf '\nTrying %s\n' "${disp}" >> "${log}" |