diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-07-26 17:24:09 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-07-27 12:06:56 +0000 |
| commit | e4d542950bfb2135c866ef0eeae85bb5c7f1296e (patch) | |
| tree | cd10f2b07d3a4861b5a292afda0e8b066327ef0f /abuild.in | |
| parent | a51c8893149daee7110058bfb72a7181744893f0 (diff) | |
| download | abuild-e4d542950bfb2135c866ef0eeae85bb5c7f1296e.tar.bz2 abuild-e4d542950bfb2135c866ef0eeae85bb5c7f1296e.tar.xz | |
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.
Diffstat (limited to 'abuild.in')
| -rw-r--r-- | abuild.in | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 |