mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-27 01:12:08 +00:00
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.
This commit is contained in:
parent
9207fccde2
commit
a01d11d9bc
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user