From 2284708d436738285afa5eddc9204c7350f9cf05 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 16 Jul 2015 09:38:02 +0200
Subject: [PATCH] xbps-src: remove autodeps for target pkg if -t is not set.

When building with -C and without -t (xbps-uchroot(1) with overlayfs),
make sure to remove autodeps prior to start resolving dependencies.

This is necessary for cases where a previous built pkg contains the
same build dependency required for another pkg with -C, resulting
in dependencies being detected as installed and later removed.

Thanks to @dominikh and @Gottox for info and comments.
---
 common/xbps-src/libexec/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh
index 497d559c27..fb798619b9 100755
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@@ -34,6 +34,9 @@ if [ -z "$XBPS_CROSS_PREPARE" ]; then
     install_cross_pkg $XBPS_CROSS_BUILD || exit $?
     prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
 fi
+if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" ]; then
+    remove_pkg_autodeps
+fi
 # Install dependencies from binary packages
 if [ "$PKGNAME" != "$TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
     install_pkg_deps $PKGNAME $TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?