ebuild.sh: skip QA_* init in "depend" phase
authorZac Medico <zmedico@gentoo.org>
Mon, 10 Jan 2011 05:31:55 +0000 (21:31 -0800)
committerZac Medico <zmedico@gentoo.org>
Wed, 12 Jan 2011 15:41:15 +0000 (07:41 -0800)
bin/ebuild.sh

index 35ac05243f200519e4aba6a1a6448d6cb823513e..7c14068c20c1f6a848a6b90356c3c59fa6e6da60 100755 (executable)
@@ -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