summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-07-05 17:27:31 +0300
committerTimo Teräs <timo.teras@iki.fi>2016-07-05 17:28:48 +0300
commitfd02387cc1c7efacd5d48d18a9d1d6b7c715c7ef (patch)
tree99dab7746e019dc7a3fdb39b9476961a340cff55
parent4bfb5c8fc102b074545d5be174213df0177d21fd (diff)
downloadabuild-fd02387cc1c7efacd5d48d18a9d1d6b7c715c7ef.tar.gz
abuild-fd02387cc1c7efacd5d48d18a9d1d6b7c715c7ef.tar.bz2
abuild-fd02387cc1c7efacd5d48d18a9d1d6b7c715c7ef.tar.xz
abuild-fd02387cc1c7efacd5d48d18a9d1d6b7c715c7ef.zip
abuild: fix cross compilation undeps()
"apk del" now returns error if the package name does not exist. Thus when cross compiling, always install the virtual .makedepends-$pkgname name for chroot also since undeps() will try to uninstall it always.
-rw-r--r--abuild.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/abuild.in b/abuild.in
index db82cfd..883c661 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1812,7 +1812,7 @@ builddeps() {
--simulate --quiet $builddeps || return 1
$SUDO_APK add --repository "$abuildrepo" $apk_opt_wait \
--virtual .makedepends-$pkgname $builddeps || return 1
- if [ -n "$hostdeps" ]; then
+ if cross_compiling; then
$SUDO_APK add --root "$CBUILDROOT" --repository "$abuildrepo" $apk_opt_wait \
--simulate --quiet $hostdeps || return 1
$SUDO_APK add --root "$CBUILDROOT" --repository "$abuildrepo" $apk_opt_wait \