Skip to content
Snippets Groups Projects
Commit 53fb2f62 authored by Natanael Copa's avatar Natanael Copa
Browse files

abuild: fix typo of rpaths

parent 0af20381
No related branches found
No related tags found
No related merge requests found
...@@ -924,18 +924,18 @@ trace_apk_deps() { ...@@ -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"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment