Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 16 Apr 2010 18:42:45 +0000 (20:42 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 16 Apr 2010 18:42:45 +0000 (20:42 +0200)
Conflicts:
bin/misc-functions.sh

1  2 
bin/misc-functions.sh

index ba2df1b4dcfc4c47d48285674c135b18bff151df,2fd0491981d0505f1385e47c92da276284666a31..da3c3f72bbc3c82688c91047d7dabf8acb0548a6
mode 100644,100755..100644
@@@ -317,7 -279,7 +317,7 @@@ install_qa_check_elf() 
                # Check for shared libraries lacking NEEDED entries
                qa_var="QA_DT_NEEDED_${ARCH/-/_}"
                eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")"
-               f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
 -              f=$(scanelf -ByF '%n %p' "${D}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
++              f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
                if [[ -n ${f} ]] ; then
                        echo "${f}" > "${T}"/scanelf-missing-NEEDED.log
                        if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then