From d0981df645a4ae48b48c1049b8d76c971459a063 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 19 Aug 2007 09:56:50 +0000 Subject: [PATCH] Merged from trunk 7644:7645 | 7644 | remove "risky" message about -O2 | | SpankMan | | | 7645 | filter out kernel modules from ELF QA checks #184443 | | SpankMan | | svn path=/main/branches/prefix/; revision=7646 --- bin/misc-functions.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 5b3442853..c9e2588cd 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -61,12 +61,12 @@ install_qa_check() { if type -P scanelf > /dev/null && ! hasq binchecks ${RESTRICT}; then local qa_var insecure_rpath=0 tmp_quiet=${PORTAGE_QUIET} - + # display warnings when using stricter because we die afterwards if has stricter ${FEATURES} ; then unset PORTAGE_QUIET fi - + # Make sure we disallow insecure RUNPATH/RPATH's # Don't want paths that point to the tree where the package was built # (older, broken libtools would do this). Also check for null paths @@ -95,7 +95,7 @@ install_qa_check() { qa_var="QA_TEXTRELS_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_TEXTRELS=${!qa_var} [[ -n ${QA_STRICT_TEXTRELS} ]] && QA_TEXTRELS="" - export QA_TEXTRELS + export QA_TEXTRELS="${QA_TEXTRELS} lib*/modules/*.ko" f=$(scanelf -qyRF '%t %p' "${ED}" | grep -v 'usr/lib/debug/') if [[ -n ${f} ]] ; then scanelf -qyRF '%T %p' "${PORTAGE_BUILDDIR}"/ &> "${T}"/scanelf-textrel.log @@ -135,7 +135,8 @@ install_qa_check() { 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 + export QA_EXECSTACK="${QA_EXECSTACK} lib*/modules/*.ko" + export QA_WX_LOAD="${QA_WX_LOAD} lib*/modules/*.ko" f=$(scanelf -qyRF '%e %p' "${ED}" | grep -v 'usr/lib/debug/') ;; esac -- 2.26.2