From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Fri, 21 Aug 2009 14:52:01 +0000 (-0000)
Subject: Support QA_DT_HASH_${ARCH} and QA_PRESTRIPPED_${ARCH} (bug #271416).
X-Git-Tag: v2.2_rc39~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4509eb3cd38a44c296e97bbf8174fcd2620fa9a8;p=portage.git

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 977ccec7f..98308ae90 100755
--- 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 9f91cf92d..e45976642 100755
--- 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 6ed4a7a42..473bde00f 100755
--- 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