5 files changed, 32 insertions, 7 deletions
diff --git a/packages/bash/bash.inc b/packages/bash/bash.inc
index b67e8bbe39..4eba6895ba 100644
--- a/packages/bash/bash.inc
+++ b/packages/bash/bash.inc
@@ -8,17 +8,26 @@ inherit autotools gettext
 
 PARALLEL_MAKE = ""
 
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz"
+S = "${WORKDIR}/bash-${PV}"
+
 bindir = "/bin"
 sbindir = "/sbin"
 
 EXTRA_OECONF = "--with-ncurses"
-export CC_FOR_BUILD = "${BUILD_CC}"
 
 do_configure () {
 	gnu-configize
 	oe_runconf
 }
 
+do_compile_prepend() {
+	cd builtins
+	touch mkbuiltins.o
+	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${S}/include -I${S} -o mkbuiltins mkbuiltins.c
+	cd ${S}
+}
+
 pkg_postinst () {
 	touch $D${sysconfdir}/shells
 	grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb
index babb70493e..a3aa25dee5 100644
--- a/packages/bash/bash_3.0.bb
+++ b/packages/bash/bash_3.0.bb
@@ -1,6 +1,7 @@
 require bash.inc
-PR = "r9"
+PR = "r10"
 
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
-        file://bash-3.0-fixes.patch;patch=1 \
-	file://signames-mipsel.diff;patch=1"
+SRC_URI += "\
+  file://bash-3.0-fixes.patch;patch=1 \
+  file://signames-mipsel.diff;patch=1 \
+"
diff --git a/packages/bash/bash_3.2.bb b/packages/bash/bash_3.2.bb
index 883df50194..568f8206f5 100644
--- a/packages/bash/bash_3.2.bb
+++ b/packages/bash/bash_3.2.bb
@@ -1,7 +1,9 @@
 require bash.inc
-PR = "r4"
 
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+PR = "r5"
+
+SRC_URI += "\
+           file://builtins.patch;patch=1 \
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0 \
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0 \
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0 \
diff --git a/packages/bash/files/.mtn2git_empty b/packages/bash/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bash/files/.mtn2git_empty
diff --git a/packages/bash/files/builtins.patch b/packages/bash/files/builtins.patch
new file mode 100644
index 0000000000..d6881ac8a3
--- /dev/null
+++ b/packages/bash/files/builtins.patch
@@ -0,0 +1,13 @@
+Index: bash-3.2/builtins/Makefile.in
+===================================================================
+--- bash-3.2.orig/builtins/Makefile.in
++++ bash-3.2/builtins/Makefile.in
+@@ -189,7 +189,7 @@ install:	@HELPINSTALL@
+ 
+ mkbuiltins.o: ../config.h
+ mkbuiltins.o: mkbuiltins.c
+-	$(RM) $@
++	echo $(RM) $@
+ 	$(CC_FOR_BUILD) -c $(CCFLAGS_FOR_BUILD) $<
+ 
+ mkbuiltins$(EXEEXT): mkbuiltins.o