From fe6419454b38beb5c585044739f2551043363a0b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 12 Sep 2012 07:03:41 +0000 Subject: abuild: avoid scanning dirs more than once --- abuild.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'abuild.in') diff --git a/abuild.in b/abuild.in index 443eeae..b2e0197 100755 --- a/abuild.in +++ b/abuild.in @@ -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 -- cgit v1.2.3-60-g2f50