abuild: allow injecting extra dependencies for bootstrap
Allowing bootstrap.sh to inject extra dependencies for build/host/target, simplifies things greatly in the bootstrap script.
This commit is contained in:
parent
a7f9bff0f7
commit
6fa4c26226
|
@ -1829,11 +1829,11 @@ calcdeps() {
|
|||
hostdeps=
|
||||
|
||||
if cross_compiling && [ -n "$makedepends_build" -o -n "$makedepends_host" ]; then
|
||||
for i in $1 $makedepends_build; do
|
||||
for i in $EXTRADEPENDS_BUILD $1 $makedepends_build; do
|
||||
list_has $i $hostdeps && continue
|
||||
builddeps="$builddeps $i"
|
||||
done
|
||||
for i in $depends $makedepends_host; do
|
||||
for i in $EXTRADEPENDS_HOST $EXTRADEPENDS_TARGET $depends $makedepends_host; do
|
||||
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
|
||||
list_has $i $hostdeps && continue
|
||||
subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
|
||||
|
@ -1841,11 +1841,12 @@ calcdeps() {
|
|||
else
|
||||
[ -z "$makedepends" ] && makedepends="$makedepends_build $makedepends_host"
|
||||
want_check && makedepends="$makedepends $checkdepends"
|
||||
for i in $1 $depends $makedepends; do
|
||||
for i in $EXTRADEPENDS_BUILD $EXTRADEPENDS_HOST $1 $depends $makedepends; do
|
||||
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
|
||||
list_has $i $builddeps && continue
|
||||
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
|
||||
done
|
||||
hostdeps="$EXTRADEPENDS_TARGET"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue