[oe-commits] org.oe.dev bash 3.2 fix compiling, this time for real

[mickeyl commit]

bash 3.2 fix compiling, this time for real

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9baecd01d24088fd8228a1f5819a9993c850630e
ViewMTN: http://monotone.openembedded.org/revision/info/9baecd01d24088fd8228a1f5819a9993c850630e
Files:
1
packages/bash/files
packages/bash/files/builtins.patch
packages/bash/bash.inc
packages/bash/bash_3.0.bb
packages/bash/bash_3.2.bb
Diffs:

#
# mt diff -rd3f40a7a15ea1a9ff7b3f99a2b10ad2c3b8db269 -r9baecd01d24088fd8228a1f5819a9993c850630e
#
#
#
# add_dir "packages/bash/files"
# 
# add_file "packages/bash/files/builtins.patch"
#  content [21d040e26c126f8e174f1eb97b4deb63f560a3cb]
# 
# patch "packages/bash/bash.inc"
#  from [47fa2bd335c92a0e85f7beabe6d12329d7d9092c]
#    to [f80c48705dded15d54b89ec93792f02cdaa1de72]
# 
# patch "packages/bash/bash_3.0.bb"
#  from [a8cbd9f528543fa43f70dbc8e2f010addf0dce4c]
#    to [c5b357d7c2bbc27e3e02dd73d7b532faeb0461f5]
# 
# patch "packages/bash/bash_3.2.bb"
#  from [dea6434e0564945aed7f8131f5be825a104febae]
#    to [efdb38a0bc9dd6aa39807b4101582e878d9bd101]
#
============================================================
--- packages/bash/files/builtins.patch	21d040e26c126f8e174f1eb97b4deb63f560a3cb
+++ packages/bash/files/builtins.patch	21d040e26c126f8e174f1eb97b4deb63f560a3cb
@@ -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
============================================================
--- packages/bash/bash.inc	47fa2bd335c92a0e85f7beabe6d12329d7d9092c
+++ packages/bash/bash.inc	f80c48705dded15d54b89ec93792f02cdaa1de72
@@ -8,11 +8,13 @@ PARALLEL_MAKE = ""
 
 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
============================================================
--- packages/bash/bash_3.0.bb	a8cbd9f528543fa43f70dbc8e2f010addf0dce4c
+++ packages/bash/bash_3.0.bb	c5b357d7c2bbc27e3e02dd73d7b532faeb0461f5
@@ -1,6 +1,7 @@ require bash.inc
 require bash.inc
-PR = "r9"
+PR = "r10"
 
+SRC_URI += "\
+  file://bash-3.0-fixes.patch;patch=1 \
+  file://signames-mipsel.diff;patch=1 \
+"
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
-        file://bash-3.0-fixes.patch;patch=1 \
-	file://signames-mipsel.diff;patch=1"
============================================================
--- packages/bash/bash_3.2.bb	dea6434e0564945aed7f8131f5be825a104febae
+++ packages/bash/bash_3.2.bb	efdb38a0bc9dd6aa39807b4101582e878d9bd101
@@ -2,7 +2,8 @@ PR = "r5"
 
 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 \