oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: allow injecting extra dependencies for bootstrap

Browse Source 
Allowing bootstrap.sh to inject extra dependencies for build/host/target,
simplifies things greatly in the bootstrap script.
This commit is contained in:
Timo Teräs 2017-02-16 15:17:11 +02:00
parent a7f9bff0f7
commit 6fa4c26226
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
abuild.in
View File

@ -1829,11 +1829,11 @@ calcdeps() {
hostdeps= hostdeps=
if cross_compiling && [ -n "$makedepends_build" -o -n "$makedepends_host" ]; then 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 list_has $i $hostdeps && continue
builddeps="$builddeps $i" builddeps="$builddeps $i"
done done
for i in $depends $makedepends_host; do for i in $EXTRADEPENDS_HOST $EXTRADEPENDS_TARGET $depends $makedepends_host; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
list_has $i $hostdeps && continue list_has $i $hostdeps && continue
subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
@ -1841,11 +1841,12 @@ calcdeps() {
else else
[ -z "$makedepends" ] && makedepends="$makedepends_build $makedepends_host" [ -z "$makedepends" ] && makedepends="$makedepends_build $makedepends_host"
want_check && makedepends="$makedepends $checkdepends" 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 [ "$pkgname" = "${i%%[<>=]*}" ] && continue
list_has $i $builddeps && continue list_has $i $builddeps && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done
hostdeps="$EXTRADEPENDS_TARGET"
fi fi
} }