RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Natanael Copa 2015-10-29 15:30:53 +00:00
parent 333a382514
commit ef647cce73
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
abuild.in
View File

@ -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() {
} }
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