From: Marius Mauch Date: Sat, 9 Dec 2006 16:00:11 +0000 (-0000) Subject: adjust QA_* variable names for complex values of like x86-fbsd X-Git-Tag: v2.1.2~346 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0a2016359cc38b0b658c0ef08120a52a196eb0f;p=portage.git adjust QA_* variable names for complex values of like x86-fbsd svn path=/main/trunk/; revision=5238 --- diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index b0c7e571f..7246b45e0 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -90,7 +90,7 @@ install_qa_check() { # binary-only and upstream isn't cooperating (nvidia-glx) ... we # allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ... # the former overrides the latter ... regexes allowed ! :) - qa_var="QA_TEXTRELS_${ARCH}" + qa_var="QA_TEXTRELS_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_TEXTRELS=${!qa_var} [[ -n ${QA_STRICT_TEXTRELS} ]] && QA_TEXTRELS="" export QA_TEXTRELS @@ -127,10 +127,10 @@ install_qa_check() { # QA_EXECSTACK ... the former overrides the latter ... # regexes allowed ! :) - qa_var="QA_EXECSTACK_${ARCH}" + qa_var="QA_EXECSTACK_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_EXECSTACK=${!qa_var} [[ -n ${QA_STRICT_EXECSTACK} ]] && QA_EXECSTACK="" - qa_var="QA_WX_LOAD_${ARCH}" + qa_var="QA_WX_LOAD_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_WX_LOAD=${!qa_var} [[ -n ${QA_STRICT_WX_LOAD} ]] && QA_WX_LOAD="" export QA_EXECSTACK QA_WX_LOAD