Commit fe641945 authored by Natanael Copa's avatar Natanael Copa

abuild: avoid scanning dirs more than once

parent 53fb2f62
......@@ -923,7 +923,7 @@ trace_apk_deps() {
}
find_scanelf_paths() {
local controldir="$1" datadir="$2"
local datadir="$1"
local paths="$datadir/lib:$datadir/usr/lib" i= rpaths=
if [ -n "$ldpath" ]; then
paths="$paths:$(echo "$ldpath" | sed "s|\(^\|:\)|\1$datadir|g")"
......@@ -932,9 +932,12 @@ find_scanelf_paths() {
for rpaths in "$pkgbasedir"/.control.*/.rpaths; do
[ -f "$rpaths" ] || continue
while read i; do
if [ -d "$datadir/$i" ]; then
paths="$paths:$datadir/$i"
local dir="${datadir}${i}"
IFS=:
if [ -d "$dir" ] && ! list_has "$dir" $paths; then
paths="$paths:${dir}"
fi
unset IFS
done < "$rpaths"
done
echo "$paths"
......@@ -946,7 +949,7 @@ scan_shared_objects() {
# allow spaces in paths
IFS=:
set -- $(find_scanelf_paths "$controldir" "$datadir")
set -- $(find_scanelf_paths "$datadir")
unset IFS
if options_has "ldpath-recursive"; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment