summaryrefslogtreecommitdiff
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-02 11:30:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-02 11:30:14 +0000
commit3bd2388915c065a13c0a40365f56528121890069 (patch)
tree33d2a9f1b13008853350672f1dea2589ef34c10d /abuild.in
parentd02257f0c807bcdafbd5387096188da67c3640d1 (diff)
downloadabuild-3bd2388915c065a13c0a40365f56528121890069.tar.gz
abuild-3bd2388915c065a13c0a40365f56528121890069.tar.bz2
abuild-3bd2388915c065a13c0a40365f56528121890069.tar.xz
abuild-3bd2388915c065a13c0a40365f56528121890069.zip
abuild: depend on so: provides when available
and fall back to traditional so dependency tracing when not available also sort the deps
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/abuild.in b/abuild.in
index e885dd9..5c6c3dd 100755
--- a/abuild.in
+++ b/abuild.in
@@ -890,7 +890,11 @@ trace_apk_deps() {
self_provided="$self_provided $found"
fi
else
- missing="$missing $i"
+ if $APK info --quiet --installed "so:$i"; then
+ autodeps="$autodeps so:$i"
+ else
+ missing="$missing $i"
+ fi
fi
done
@@ -918,8 +922,8 @@ trace_apk_deps() {
fi
[ -z "$autodeps" ] && return 0
for i in $autodeps; do
- echo "depend = $i" >> "$dir"/.PKGINFO
- done
+ echo "depend = $i"
+ done | sort -u >> "$dir"/.PKGINFO
}
find_scanelf_paths() {