From 2a9c3c1b85b2107c351c1f6129995a3f52eec91c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 9 Jun 2008 23:01:14 +0000
Subject: bash 3.2 fix compiling, this time for real

---
 packages/bash/bash.inc             |  4 +++-
 packages/bash/bash_3.0.bb          |  9 +++++----
 packages/bash/bash_3.2.bb          |  3 ++-
 packages/bash/files/.mtn2git_empty |  0
 packages/bash/files/builtins.patch | 13 +++++++++++++
 5 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 packages/bash/files/.mtn2git_empty
 create mode 100644 packages/bash/files/builtins.patch

(limited to 'packages/bash')

diff --git a/packages/bash/bash.inc b/packages/bash/bash.inc
index dd2a180bb1..bf4a345963 100644
--- a/packages/bash/bash.inc
+++ b/packages/bash/bash.inc
@@ -8,11 +8,13 @@ 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 RM="echo"
 
 do_configure () {
 	gnu-configize
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 dc3485514c..568f8206f5 100644
--- a/packages/bash/bash_3.2.bb
+++ b/packages/bash/bash_3.2.bb
@@ -2,7 +2,8 @@ require bash.inc
 
 PR = "r5"
 
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+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
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
-- 
cgit 1.2.3-korg