summaryrefslogtreecommitdiffstats
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-10-29 15:30:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-10-29 18:06:42 +0000
commitef647cce7328b12c3f734f3ebd373bf577de27ca (patch)
tree2896f3edd4ad4b439d65ae6b0e4db58626c1b7c2 /abuild.in
parent333a382514ce8b3d1b54db656628e643d08e221a (diff)
downloadabuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.tar.bz2
abuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.tar.xz
abuild: do not install itself as a makedepend
we might need add $pkgname as a dependency for $pkgname-dev and then we should not install ourselves in case makedepends="$depends_dev" This is needed foor bootstraping.
Diffstat (limited to 'abuild.in')
-rw-r--r--abuild.in11
1 files changed, 4 insertions, 7 deletions
diff --git a/abuild.in b/abuild.in
index 0dd8f9a..e44696b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1721,14 +1721,12 @@ builddeps() {
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done
- hostdeps="$makedepends_host"
- for i in $depends; do
+ for i in $depends $makedepends_host; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
done
else
- builddeps="$makedepends"
- for i in $BUILD_BASE $depends; do
+ for i in $BUILD_BASE $depends $makedepends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done
@@ -1962,9 +1960,8 @@ post_add() {
}
deps() {
- local builddeps i
- builddeps="$makedepends"
- for i in $depends; do
+ local builddeps= i
+ for i in $depends $makedepends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done