RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2024-12-27 17:32:11 +00:00
Code Issues Projects Releases Wiki Activity

abuild: check both build and host dependencies first

Browse Source 
So we don't waste time installing dependencies on builder if
the host dependencies are not satisfiable.
This commit is contained in:
Timo Teräs 2016-07-26 17:24:09 +00:00
parent 9207fccde2
commit a01d11d9bc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
abuild.in
View File

@ -1821,11 +1821,14 @@ builddeps() {
# apk-tools --virtual is no goot at reporting those. # apk-tools --virtual is no goot at reporting those.
$SUDO_APK add --repository "$REPODEST/$repo" $apk_opt_wait \ $SUDO_APK add --repository "$REPODEST/$repo" $apk_opt_wait \
--simulate --quiet $builddeps || return 1 --simulate --quiet $builddeps || return 1
$SUDO_APK add --repository "$REPODEST/$repo" $apk_opt_wait \
--virtual .makedepends-$pkgname $builddeps || return 1
if cross_compiling; then if cross_compiling; then
$SUDO_APK add --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \ $SUDO_APK add --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
--simulate --quiet $hostdeps || return 1 --simulate --quiet $hostdeps || return 1
fi
$SUDO_APK add --repository "$REPODEST/$repo" $apk_opt_wait \
--virtual .makedepends-$pkgname $builddeps || return 1
if cross_compiling; then
$SUDO_APK add --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \ $SUDO_APK add --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
--no-scripts --virtual .makedepends-$pkgname $hostdeps || return 1 --no-scripts --virtual .makedepends-$pkgname $hostdeps || return 1
fi fi