From b594820048101db684dc41f08fcbe5764648f07a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 18 Oct 2013 10:21:27 +0200
Subject: [PATCH] chroot-glibc: repair bootstrap build.

---
 srcpkgs/chroot-glibc/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template
index a486b39447..9d80ca8ea0 100644
--- a/srcpkgs/chroot-glibc/template
+++ b/srcpkgs/chroot-glibc/template
@@ -13,10 +13,15 @@ checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
 
 bootstrap=yes
 
-if [ "$IN_CHROOT" ]; then
+if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl"
 fi
 
+pre_configure() {
+	# Detect GNU Make 4.x.
+	sed -e 's,3.\[89\]\*,& \| \[4-9\]*,g' -i configure
+}
+
 do_configure() {
 	[ ! -d build ] && mkdir build
 	cd build
@@ -66,13 +71,14 @@ do_install() {
 	# ldd is a bash script, so make it run as such.
 	. $XBPS_HELPERSDIR/replace-interpreter.sh
 	replace_interpreter bash ${DESTDIR}/usr/bin/ldd
+	chmod 755 ${DESTDIR}/usr/bin/ldd
 
 	# On x86_64, add dynamic linker's 32bit version to ldd.
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
 		sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" ${DESTDIR}/usr/bin/ldd
+		chmod 755 ${DESTDIR}/usr/bin/ldd
 	fi
-	chmod 755 ${DESTDIR}/usr/bin/ldd
 
 	vmkdir etc/ld.so.conf.d
 	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf