]> git.ipfire.org Git - pakfire.git/commitdiff
Fix library check when updating GCC.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 Mar 2012 15:11:01 +0000 (16:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 Mar 2012 15:11:01 +0000 (16:11 +0100)
As it only happens on ARM, the new GCC libdir is not found.

tools/quality-agent.d/003-libs-location

index 48b2521514b54b809565679722bf9607f6a6720d..ce5ba72c7d9b62449a208b0489baec3bc47a1500 100755 (executable)
@@ -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*}