From 0de4b4d8bc2e1cef746a556c81092a10029dd310 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Mon, 17 Oct 2011 04:45:07 +0000
Subject: [PATCH 1/3] gcc: Use do_configure() to speed up rebuilds.

---
 srcpkgs/gcc/template | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 38284b7691..2fa748716e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -64,8 +64,9 @@ else
 	_triplet="${xbps_machine}-pc-linux-gnu"
 fi
 
-do_build()
+do_configure()
 {
+	set +e
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 		local SAVEDPATH=$PATH
@@ -88,6 +89,18 @@ do_build()
 		--enable-linker-build-id --enable-gnu-unique-object \
 		--enable-checking=release
 
+	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
+	set -e
+}
+
+do_build()
+{
+	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
+		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
+		local SAVEDPATH=$PATH
+		export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+	fi
+
 	make ${makejobs}
 	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
 }

From 51ab4a989043b63d6a718ef1122f3e41624ceabb Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Mon, 17 Oct 2011 14:14:09 +0000
Subject: [PATCH 2/3] gcc: try to use bash instead of dash for shell while
 building

---
 srcpkgs/gcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 2fa748716e..b8b2c7cd9d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -78,7 +78,7 @@ do_configure()
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-	./configure ${CONFIGURE_SHARED_ARGS} --libexecdir=/usr/lib \
+	CONFIG_SHELL=/bin/bash ./configure ${CONFIGURE_SHARED_ARGS} --libexecdir=/usr/lib \
 		--enable-clocale=gnu --disable-bootstrap --libdir=/usr/lib \
 		--enable-threads=posix --enable-__cxa_atexit --disable-multilib \
 		--enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \

From c2c7a3f456d3f7f6d59fb4dac18b736c1243e8c1 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Mon, 17 Oct 2011 16:33:11 +0000
Subject: [PATCH 3/3] gcc: remove bootstrap path change in do_build()

---
 srcpkgs/gcc/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index b8b2c7cd9d..d5a73aab8b 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -66,7 +66,6 @@ fi
 
 do_configure()
 {
-	set +e
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 		local SAVEDPATH=$PATH
@@ -90,19 +89,19 @@ do_configure()
 		--enable-checking=release
 
 	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
-	set -e
 }
 
 do_build()
 {
-	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
-		local SAVEDPATH=$PATH
-		export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-	fi
+	set +e 
+#	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
+#		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
+#		local SAVEDPATH=$PATH
+#		export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+#	fi
 
-	make ${makejobs}
-	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
+	make ${makejobs} || return 1
+#	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
 }
 
 do_install()