summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-11-02 09:26:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-11-02 09:26:09 +0000
commit9400ec015255bbe693c110d0a3bd224f72baf4c7 (patch)
tree13ccd8154406e2426fd3d8ff5b0000963a4ed2f1
parent4e633c5be2163bd94a8a967d7a050af7a1b829fb (diff)
downloadalpine-iso-9400ec015255bbe693c110d0a3bd224f72baf4c7.tar.bz2
alpine-iso-9400ec015255bbe693c110d0a3bd224f72baf4c7.tar.xz
abuild: fix detection of pkgconfig dependency
-rwxr-xr-xabuild.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/abuild.in b/abuild.in
index 51018e8..27e8ab6 100755
--- a/abuild.in
+++ b/abuild.in
@@ -426,6 +426,12 @@ trace_apk_deps() {
local dir="$2"
local i j found autodeps=
msg "Tracing dependencies for $name..."
+ # add pkgconfig if usr/lib/pkgconfig is found
+ if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \
+ && ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
+ msg "Added pkgconfig as dependency"
+ echo "depend = pkgconfig" >> "$dir"/.PKGINFO
+ fi
for i in $(cat "$dir"/.needs-so 2>/dev/null); do
found=
# first check if its provide by same apkbuild
@@ -455,12 +461,6 @@ trace_apk_deps() {
for i in $autodeps; do
echo "depend = $i" >> "$dir"/.PKGINFO
done
- # add pkgconfig if usr/lib/pkgconfig is found
- if [ -d "$pkgbasdir"/$name/usr/lib/pkgconfig ] \
- && ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
- msg "Added pkgconfig as dependency"
- echo "depend = pkgconfig" >> "$dir"/.PKGINFO
- fi
}
create_apks() {