From a01d11d9bc16c5d4c04270d13fc9c69966e6da5b Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 26 Jul 2016 17:24:09 +0000 Subject: abuild: check both build and host dependencies first So we don't waste time installing dependencies on builder if the host dependencies are not satisfiable. --- abuild.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'abuild.in') diff --git a/abuild.in b/abuild.in index 84971b1..3f6439f 100644 --- a/abuild.in +++ b/abuild.in @@ -1821,11 +1821,14 @@ builddeps() { # apk-tools --virtual is no goot at reporting those. $SUDO_APK add --repository "$REPODEST/$repo" $apk_opt_wait \ --simulate --quiet $builddeps || return 1 - $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 \ --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 \ --no-scripts --virtual .makedepends-$pkgname $hostdeps || return 1 fi -- cgit v1.2.3-60-g2f50