diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-01-09 21:31:55 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-12 07:41:15 -0800 |
| commit | 93885d4b116a1f3e285263ba3c0a621568257f07 (patch) | |
| tree | 8999e300a61a234c345e4cbfbf5c65cef3451c48 | |
| parent | Scheduler: free unneeded uninstall task from mem (diff) | |
| download | portage-93885d4b116a1f3e285263ba3c0a621568257f07.tar.gz portage-93885d4b116a1f3e285263ba3c0a621568257f07.tar.bz2 portage-93885d4b116a1f3e285263ba3c0a621568257f07.zip | |
ebuild.sh: skip QA_* init in "depend" phase
| -rwxr-xr-x | bin/ebuild.sh | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 35ac05243..7c14068c2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -2078,31 +2078,32 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then [[ -n $CCACHE_SIZE ]] && ccache -M $CCACHE_SIZE &> /dev/null fi - fi - if [[ -n $QA_PREBUILT ]] ; then + if [[ -n $QA_PREBUILT ]] ; then - # these ones support fnmatch patterns - QA_EXECSTACK+=" $QA_PREBUILT" - QA_TEXTRELS+=" $QA_PREBUILT" - QA_WX_LOAD+=" $QA_PREBUILT" + # these ones support fnmatch patterns + QA_EXECSTACK+=" $QA_PREBUILT" + QA_TEXTRELS+=" $QA_PREBUILT" + QA_WX_LOAD+=" $QA_PREBUILT" - # these ones support regular expressions, so translate - # fnmatch patterns to regular expressions - for x in QA_DT_HASH QA_DT_NEEDED QA_PRESTRIPPED QA_SONAME ; do - if [[ $(declare -p $x 2>/dev/null) = declare\ -a* ]] ; then - eval "$x=(\"\${$x[@]}\" ${QA_PREBUILT//\*/.*})" - else - eval "$x+=\" ${QA_PREBUILT//\*/.*}\"" - fi - done + # these ones support regular expressions, so translate + # fnmatch patterns to regular expressions + for x in QA_DT_HASH QA_DT_NEEDED QA_PRESTRIPPED QA_SONAME ; do + if [[ $(declare -p $x 2>/dev/null) = declare\ -a* ]] ; then + eval "$x=(\"\${$x[@]}\" ${QA_PREBUILT//\*/.*})" + else + eval "$x+=\" ${QA_PREBUILT//\*/.*}\"" + fi + done - unset x - fi + unset x + fi - # This needs to be exported since prepstrip is a separate shell script. - [[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED - eval "[[ -n \$QA_PRESTRIPPED_${ARCH/-/_} ]] && export QA_PRESTRIPPED_${ARCH/-/_}" + # This needs to be exported since prepstrip is a separate shell script. + [[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED + eval "[[ -n \$QA_PRESTRIPPED_${ARCH/-/_} ]] && \ + export QA_PRESTRIPPED_${ARCH/-/_}" + fi fi fi |