From 1f854abff535bbd3f5dc817eb6e8df70258d1665 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Oct 2013 11:15:17 +0200
Subject: [PATCH] glibc: prepare to be a bootstrap pkg; supersedes
 chroot-glibc.

---
 srcpkgs/glibc/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 9ca30eb862..9e2184b639 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -9,7 +9,12 @@ license="GPL-2, LGPL-2.1, BSD"
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
 checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
 
-hostmakedepends="bison perl"
+bootstrap=yes
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="bison perl"
+fi
+
 # Force creation of -dbg pkg, required by valgrind.
 force_debug_pkgs=yes
 
@@ -34,12 +39,12 @@ do_configure() {
 		_floatabi="--with-float=hard"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		_headers="--with-headers=$XBPS_CROSS_BASE/include"
+		_headers="--with-headers=${XBPS_CROSS_BASE}/usr/include"
 	else
-		_headers="--with-headers=/usr/include"
+		_headers="--with-headers=${XBPS_MASTERDIR}/usr/include"
 	fi
 
-	../configure ${configure_args} \
+	SHELL=/bin/bash ../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \
 		--enable-multi-arch --enable-bind-now \