Support QA_DT_HASH_${ARCH} and QA_PRESTRIPPED_${ARCH} (bug #271416).

svn path=/main/trunk/; revision=14114

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 977ccec7f4b73b64249788c4d9e0c57561125867..98308ae9065b58143e5abb80b40bfe08118b59fb 100755 (executable)
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -100,6 +100,8 @@ save_elf_debug() {
 if ! hasq binchecks ${RESTRICT} && \
        ! hasq strip ${RESTRICT} ; then
        log=$T/scanelf-already-stripped.log
+       qa_var="QA_PRESTRIPPED_${ARCH/-/_}"
+       [[ -n ${!qa_var} ]] && QA_PRESTRIPPED="${!qa_var}"
        scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^$D##" > "$log"
        if [[ -n $QA_PRESTRIPPED && -s $log && \
                ${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9f91cf92d51f74bd9e810b874840811bb347b053..e45976642216c7dfc5ba7caf877fe612683bc510 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1841,6 +1841,7 @@ _source_ebuild() {
 
        # 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"
 }
 
 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 6ed4a7a423ce54ab1ca8bfa58c553cb756f91ec6..473bde00f2ae414028875c8536e9a3707dddd012 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -167,6 +167,8 @@ install_qa_check() {
 
                # Check for files built without respecting LDFLAGS
                if [[ "${LDFLAGS}" == *--hash-style=gnu* ]] && [[ "${PN}" != *-bin ]] ; then
+                       qa_var="QA_DT_HASH_${ARCH/-/_}"
+                       eval "[[ -n \${!qa_var} ]] && QA_DT_HASH=(\"\${${qa_var}[@]}\")"
                        f=$(scanelf -qyRF '%k %p' -k .hash "${D}" | sed -e "s:\.hash ::")
                        if [[ -n ${f} ]] ; then
                                echo "${f}" > "${T}"/scanelf-ignored-LDFLAGS.log