From c09b2df7a7033955d593313474f0cb318c2ac31b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 19 May 2014 12:42:43 +0200
Subject: [PATCH] xbps-src: fix bootstrap target with gcc being part of it.

---
 xbps-src | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 32a86505434..db7da1ba97e 100755
--- a/xbps-src
+++ b/xbps-src
@@ -531,7 +531,16 @@ case "$XBPS_TARGET" in
         [ ! -d $XBPS_SRCPKGDIR/base-chroot ] && \
             msg_error "Cannot find $XBPS_SRCPKGDIR/base-chroot directory!\n"
         XBPS_TARGET_PKG="base-chroot"
-        setup_pkg $XBPS_TARGET_PKG && install_pkg $XBPS_TARGET
+        bootstrap_vpkg=${XBPS_MASTERDIR}/etc/xbps/virtualpkg.d/bootstrap.vpkg
+        mkdir -p ${XBPS_MASTERDIR}/etc/xbps/virtualpkg.d
+        if [ ! -s ${bootstrap_vpkg} ]; then
+            # Fool xbps to resolve dependencies.
+            echo 'virtualpkg=libgcc-4.4.0_1:base-files' >> ${bootstrap_vpkg}
+            echo 'virtualpkg=libstdc++-4.4.0_1:base-files' >> ${bootstrap_vpkg}
+        fi
+        setup_pkg $XBPS_TARGET_PKG
+        install_pkg $XBPS_TARGET
+        rm -f ${bootstrap_vpkg}
         ;;
     bootstrap-update)
         if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then