From cfff850167eb382d78e99b87ddd9d783a9b8e95d Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Mon, 10 Aug 2015 17:06:50 +0000 Subject: [PATCH] Make baselibs QA check non recursive and activate it again Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D3352 --- Mk/Scripts/qa.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 9292f29f79f7..6ce98a3427e7 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -99,19 +99,19 @@ baselibs() { [ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return while read f; do case ${f} in - /usr/lib/libarchive*) - err "Bad linking on ${f} please add USES=libarchive" + *NEEDED*\[libarchive.so.[56]]) + err "Bad linking on ${f##* } please add USES=libarchive" rc=1 ;; - /lib/libedit*) - err "Bad linking on ${f} please add USES=libedit" + *NEEDED*\[libedit.so.7]) + err "Bad linking on ${f##* } please add USES=libedit" rc=1 ;; esac done <<-EOF $(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \ ${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \ - -type f -exec ldd -a {} + 2>/dev/null) + -type f -exec readelf -d {} + 2>/dev/null) EOF return ${rc} } @@ -293,7 +293,7 @@ prefixvar() { fi } -checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar" # baselibs" +checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar baselibs" ret=0 cd ${STAGEDIR}