diff options
| -rwxr-xr-x | bin/misc-functions.sh | 12 | ||||
| -rw-r--r-- | man/ebuild.5 | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 69c0ff1ce..cfd7e0a3c 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -277,20 +277,20 @@ install_qa_check() { fi # Check for shared libraries lacking NEEDED entries - qa_var="QA_NEEDED_${ARCH/-/_}" - eval "[[ -n \${!qa_var} ]] && QA_NEEDED=(\"\${${qa_var}[@]}\")" + qa_var="QA_DT_NEEDED_${ARCH/-/_}" + eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")" f=$(scanelf -ByF '%n %p' "${D}"{,usr/}lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:") if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-missing-NEEDED.log - if [[ "${QA_STRICT_NEEDED-unset}" == unset ]] ; then - if [[ ${#QA_NEEDED[@]} -gt 1 ]] ; then - for x in "${QA_NEEDED[@]}" ; do + if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then + if [[ ${#QA_DT_NEEDED[@]} -gt 1 ]] ; then + for x in "${QA_DT_NEEDED[@]}" ; do sed -e "s#^/${x#/}\$##" -i "${T}"/scanelf-missing-NEEDED.log done else local shopts=$- set -o noglob - for x in ${QA_NEEDED} ; do + for x in ${QA_DT_NEEDED} ; do sed -e "s#^/${x#/}\$##" -i "${T}"/scanelf-missing-NEEDED.log done set +o noglob diff --git a/man/ebuild.5 b/man/ebuild.5 index 4a2d29601..95d763f31 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -500,7 +500,7 @@ This should contain a list of file paths, relative to the image directory, of shared libraries that lack SONAMEs. The paths may contain regular expressions with escape\-quoted special characters. .TP -\fBQA_NEEDED\fR +\fBQA_DT_NEEDED\fR This should contain a list of file paths, relative to the image directory, of shared libraries that lack NEEDED entries. The paths may contain regular expressions with escape\-quoted special characters. |