diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-29 15:30:53 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-29 18:06:42 +0000 |
commit | ef647cce7328b12c3f734f3ebd373bf577de27ca (patch) | |
tree | 2896f3edd4ad4b439d65ae6b0e4db58626c1b7c2 | |
parent | 333a382514ce8b3d1b54db656628e643d08e221a (diff) | |
download | abuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.tar.gz abuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.tar.bz2 abuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.tar.xz abuild-ef647cce7328b12c3f734f3ebd373bf577de27ca.zip |
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.
-rw-r--r-- | abuild.in | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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 |