From: Michael Tremer Date: Tue, 6 Mar 2012 15:11:01 +0000 (+0100) Subject: Fix library check when updating GCC. X-Git-Tag: 0.9.21~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f2968430df446dcbf0e27ff870ac7aa6e8113cd;p=pakfire.git Fix library check when updating GCC. As it only happens on ARM, the new GCC libdir is not found. --- diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location index 48b252151..ce5ba72c7 100755 --- a/tools/quality-agent.d/003-libs-location +++ b/tools/quality-agent.d/003-libs-location @@ -16,13 +16,16 @@ esac # Find gcc libdir. gcc_libdir=$(gcc -print-libgcc-file-name) -gcc_libdir=$(dirname ${gcc_libdir}) +for i in 1 2; do + gcc_libdir=$(dirname ${gcc_libdir}) +done +gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1) function check() { local failed=0 local found - for lib in $(find ${BUILDROOT}/${libdir} -type f -name "lib*.so.*" 2>/dev/null); do + for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do lib=${lib##*/} lib=${lib%%.so*}