oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: fix typo of rpaths

Browse Source
This commit is contained in:
Natanael Copa 2012-09-12 07:01:05 +00:00
parent 0af2038168
commit 53fb2f62ab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
abuild.in
View File

@ -924,18 +924,18 @@ trace_apk_deps() {
find_scanelf_paths() { find_scanelf_paths() {
local controldir="$1" datadir="$2" local controldir="$1" datadir="$2"
local paths="$datadir/lib:$datadir/usr/lib" i= rpath= local paths="$datadir/lib:$datadir/usr/lib" i= rpaths=
if [ -n "$ldpath" ]; then if [ -n "$ldpath" ]; then
paths="$paths:$(echo "$ldpath" | sed "s|\(^\|:\)|\1$datadir|g")" paths="$paths:$(echo "$ldpath" | sed "s|\(^\|:\)|\1$datadir|g")"
fi fi
# search in all rpaths # search in all rpaths
for rpath in "$pkgbasedir"/.control.*/.rpath; do for rpaths in "$pkgbasedir"/.control.*/.rpaths; do
[ -f "$rpath" ] || continue [ -f "$rpaths" ] || continue
while read i; do while read i; do
if [ -d "$datadir/$i" ]; then if [ -d "$datadir/$i" ]; then
paths="$paths:$datadir/$i" paths="$paths:$datadir/$i"
fi fi
done < "$rpath" done < "$rpaths"
done done
echo "$paths" echo "$paths"
} }