From 3bd2388915c065a13c0a40365f56528121890069 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 2 Oct 2012 11:30:14 +0000 Subject: abuild: depend on so: provides when available and fall back to traditional so dependency tracing when not available also sort the deps --- abuild.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'abuild.in') 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() { -- cgit v1.2.3-70-g09d2