| 1 |
Author: fuzzyray |
| 2 |
Date: 2009-04-30 14:22:10 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 555 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/src/revdep-rebuild/revdep-rebuild |
| 8 |
Log: |
| 9 |
Add patch from loki_val to check -l dependencies in .la files (Bug #267898) |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2009-04-29 12:35:23 UTC (rev 554) |
| 14 |
+++ trunk/ChangeLog 2009-04-30 14:22:10 UTC (rev 555) |
| 15 |
@@ -1,3 +1,7 @@ |
| 16 |
+2009-04-30: Paul Varner <fuzzyray@g.o> |
| 17 |
+ * revdep-rebuild: Add patch from loki_val to check -l dependencies in |
| 18 |
+ .la files (Bug #267898) |
| 19 |
+ |
| 20 |
2009-04-24: Paul Varner <fuzzyray@g.o> |
| 21 |
* ekeyword: Fix to handle multiline KEYWORDS (Bug #267250) |
| 22 |
|
| 23 |
|
| 24 |
Modified: trunk/src/revdep-rebuild/revdep-rebuild |
| 25 |
=================================================================== |
| 26 |
--- trunk/src/revdep-rebuild/revdep-rebuild 2009-04-29 12:35:23 UTC (rev 554) |
| 27 |
+++ trunk/src/revdep-rebuild/revdep-rebuild 2009-04-30 14:22:10 UTC (rev 555) |
| 28 |
@@ -737,18 +737,39 @@ |
| 29 |
fi |
| 30 |
elif [[ $SEARCH_BROKEN ]]; then |
| 31 |
# Look for broken .la files |
| 32 |
+ la_SEARCH_DIRS="$SEARCH_DIRS" |
| 33 |
+ la_search_dir="" |
| 34 |
+ la_broken="" |
| 35 |
+ la_lib="" |
| 36 |
for depend in $( |
| 37 |
gawk -F"[=']" '/^dependency_libs/{ |
| 38 |
- gsub("^-[^[:space:]]*", "", $3); |
| 39 |
- gsub("[[:space:]]-[^[:space:]]*", "", $3); |
| 40 |
print $3 |
| 41 |
}' "$target_file" |
| 42 |
); do |
| 43 |
if [[ $depend = /* && ! -e $depend ]]; then |
| 44 |
echo "obj $target_file" >> "$BROKEN_FILE" |
| 45 |
echo_v " broken $target_file (requires $depend)" |
| 46 |
+ elif [[ $depend = "-L/"* || $depend = "-R/"* ]]; then |
| 47 |
+ if ! [[ $'\n'${la_SEARCH_DIRS}$'\n' == *$'\n'${depend#-?}$'\n'* ]]; then |
| 48 |
+ la_SEARCH_DIRS+=$'\n'"${depend#-?}" |
| 49 |
+ fi |
| 50 |
+ elif [[ $depend = "-l"* ]]; then |
| 51 |
+ la_lib="lib${depend#-l}" |
| 52 |
+ la_broken="yes" |
| 53 |
+ IFS=$'\n' |
| 54 |
+ for la_search_dir in $la_SEARCH_DIRS; do |
| 55 |
+ if [[ -e ${la_search_dir}/${la_lib}.so || -e ${la_search_dir}/${la_lib}.a ]]; then |
| 56 |
+ la_broken="no" |
| 57 |
+ fi |
| 58 |
+ done |
| 59 |
+ IFS="$OIFS" |
| 60 |
+ if [[ $la_broken = yes ]]; then |
| 61 |
+ echo "obj $target_file" >> "$BROKEN_FILE" |
| 62 |
+ echo_v " broken $target_file (requires $depend)" |
| 63 |
+ fi |
| 64 |
fi |
| 65 |
done |
| 66 |
+ unset la_SEARCH_DIRS la_search_dir la_broken la_lib |
| 67 |
fi |
| 68 |
[[ $VERBOSE ]] && |
| 69 |
progress $((++i)) $numFiles $target_file || |
Archives