Commit ef647cce authored by Natanael Copa's avatar Natanael Copa

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.
parent 333a3825
...@@ -1721,14 +1721,12 @@ builddeps() { ...@@ -1721,14 +1721,12 @@ builddeps() {
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done
hostdeps="$makedepends_host" for i in $depends $makedepends_host; do
for i in $depends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
done done
else else
builddeps="$makedepends" for i in $BUILD_BASE $depends $makedepends; do
for i in $BUILD_BASE $depends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done
...@@ -1962,9 +1960,8 @@ post_add() { ...@@ -1962,9 +1960,8 @@ post_add() {
} }
deps() { deps() {
local builddeps i local builddeps= i
builddeps="$makedepends" for i in $depends $makedepends; do
for i in $depends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment