diff options
| author | Brian Harring <ferringb@gmail.com> | 2012-09-13 21:41:04 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 23:55:44 -0700 |
| commit | a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0 (patch) | |
| tree | 6f66e33e5bb0f93a9f06d8509a970db0620c01d5 /bin/phase-helpers.sh | |
| parent | 25a5296f29bc7153fa29e2dfe8de9d08d40d9944 (diff) | |
| download | portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.tar.gz portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.tar.bz2 portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.zip | |
Convert funcs of bashrc-functions.sh to __ prefixed namespace.
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 555b2372b..106e26017 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -118,7 +118,7 @@ docompress() { if [[ $1 = "-x" ]]; then shift for f; do - f=$(strip_duplicate_slashes "${f}"); f=${f%/} + f=$(__strip_duplicate_slashes "${f}"); f=${f%/} [[ ${f:0:1} = / ]] || f="/${f}" for g in "${PORTAGE_DOCOMPRESS_SKIP[@]}"; do [[ ${f} = "${g}" ]] && continue 2 @@ -127,7 +127,7 @@ docompress() { done else for f; do - f=$(strip_duplicate_slashes "${f}"); f=${f%/} + f=$(__strip_duplicate_slashes "${f}"); f=${f%/} [[ ${f:0:1} = / ]] || f="/${f}" for g in "${PORTAGE_DOCOMPRESS[@]}"; do [[ ${f} = "${g}" ]] && continue 2 @@ -476,7 +476,7 @@ econf() { CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" [[ ${CONF_LIBDIR} != /* ]] && CONF_LIBDIR="/${CONF_LIBDIR}" - set -- --libdir="$(strip_duplicate_slashes ${CONF_PREFIX}${CONF_LIBDIR})" "$@" + set -- --libdir="$(__strip_duplicate_slashes ${CONF_PREFIX}${CONF_LIBDIR})" "$@" fi set -- \ @@ -521,7 +521,7 @@ einstall() { unset LIBDIR_VAR if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:+set}" = set ]; then EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" - EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})" + EI_DESTLIBDIR="$(__strip_duplicate_slashes ${EI_DESTLIBDIR})" LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}" unset EI_DESTLIBDIR fi |