diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-09-11 16:15:28 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-11 16:15:28 -0700 |
| commit | 11d543aacf2ee7f7f214a256aabf668ad27ca013 (patch) | |
| tree | f2601ac341ec1072a270fce7c64bd0653c7029c3 /bin/phase-helpers.sh | |
| parent | ebuild.sh: remove unused lchown and lchgrp (diff) | |
| download | portage-11d543aacf2ee7f7f214a256aabf668ad27ca013.tar.gz portage-11d543aacf2ee7f7f214a256aabf668ad27ca013.tar.bz2 portage-11d543aacf2ee7f7f214a256aabf668ad27ca013.zip | |
ebuild.sh: move hasg* funcs into econf
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 1f39c7556..a033fa837 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -369,6 +369,15 @@ unpack() { econf() { local x + _hasg() { + local x s=$1 + shift + for x ; do [[ ${x} == ${s} ]] && echo "${x}" && return 0 ; done + return 1 + } + + _hasgq() { _hasg "$@" >/dev/null ; } + local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") if [[ -n $phase_func ]] ; then if has "$EAPI" 0 1 ; then @@ -411,9 +420,9 @@ econf() { if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then CONF_LIBDIR=${!LIBDIR_VAR} fi - if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=\* "$@" ; then - export CONF_PREFIX=$(hasg --exec-prefix=\* "$@") - [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=\* "$@") + if [[ -n ${CONF_LIBDIR} ]] && ! _hasgq --libdir=\* "$@" ; then + export CONF_PREFIX=$(_hasg --exec-prefix=\* "$@") + [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(_hasg --prefix=\* "$@") : ${CONF_PREFIX:=/usr} CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" |