summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-02-16 15:17:11 +0200
committerTimo Teräs <timo.teras@iki.fi>2017-02-16 15:18:16 +0200
commit6fa4c26226fac8b8ddb407a74ce8b95021826dd5 (patch)
treea7317a4120babe0ce2d93a3a0804bdac492abf08
parenta7f9bff0f73dba6a82af6ccc60fdd2fab73a6566 (diff)
downloadabuild-6fa4c26226fac8b8ddb407a74ce8b95021826dd5.tar.gz
abuild-6fa4c26226fac8b8ddb407a74ce8b95021826dd5.tar.bz2
abuild-6fa4c26226fac8b8ddb407a74ce8b95021826dd5.tar.xz
abuild-6fa4c26226fac8b8ddb407a74ce8b95021826dd5.zip
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.
-rw-r--r--abuild.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/abuild.in b/abuild.in
index 19dedda..9394ea4 100644
--- a/abuild.in
+++ b/abuild.in
@@ -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
}