]>
Commit | Line | Data |
---|---|---|
63c2bb86 MT |
1 | From 1f2968430df446dcbf0e27ff870ac7aa6e8113cd Mon Sep 17 00:00:00 2001 |
2 | From: Michael Tremer <michael.tremer@ipfire.org> | |
3 | Date: Tue, 6 Mar 2012 16:11:01 +0100 | |
4 | Subject: [PATCH] Fix library check when updating GCC. | |
5 | ||
6 | As it only happens on ARM, the new GCC libdir is not found. | |
7 | --- | |
8 | tools/quality-agent.d/003-libs-location | 7 +++++-- | |
9 | 1 files changed, 5 insertions(+), 2 deletions(-) | |
10 | ||
11 | diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location | |
12 | index 48b2521..ce5ba72 100755 | |
13 | --- a/tools/quality-agent.d/003-libs-location | |
14 | +++ b/tools/quality-agent.d/003-libs-location | |
15 | @@ -16,13 +16,16 @@ esac | |
16 | ||
17 | # Find gcc libdir. | |
18 | gcc_libdir=$(gcc -print-libgcc-file-name) | |
19 | -gcc_libdir=$(dirname ${gcc_libdir}) | |
20 | +for i in 1 2; do | |
21 | + gcc_libdir=$(dirname ${gcc_libdir}) | |
22 | +done | |
23 | +gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1) | |
24 | ||
25 | function check() { | |
26 | local failed=0 | |
27 | local found | |
28 | ||
29 | - for lib in $(find ${BUILDROOT}/${libdir} -type f -name "lib*.so.*" 2>/dev/null); do | |
30 | + for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do | |
31 | lib=${lib##*/} | |
32 | lib=${lib%%.so*} | |
33 | ||
34 | -- | |
35 | 1.7.3.4 | |
36 |