Fix the bash 2.05b compile. Switched us to debian's patchset, which fixed a couple compile failures, then patched for some autofoo madness.

BKrev: 40d13ffefyiMiYnFKtipG4TMpNe37Q

31 files changed, 33 insertions, 4 deletions

diff --git a/bash/bash-2.05b/autofoo.patch b/bash/bash-2.05b/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/autofoo.patch
diff --git a/bash/bash-2.05b/bash205b-001.patch b/bash/bash-2.05b/bash205b-001.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-001.patch
diff --git a/bash/bash-2.05b/bash205b-002.patch b/bash/bash-2.05b/bash205b-002.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-002.patch
diff --git a/bash/bash-2.05b/bash205b-003.patch b/bash/bash-2.05b/bash205b-003.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-003.patch
diff --git a/bash/bash-2.05b/bash205b-004.patch b/bash/bash-2.05b/bash205b-004.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-004.patch
diff --git a/bash/bash-2.05b/bash205b-005.patch b/bash/bash-2.05b/bash205b-005.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-005.patch
diff --git a/bash/bash-2.05b/bash205b-006.patch b/bash/bash-2.05b/bash205b-006.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-006.patch
diff --git a/bash/bash-2.05b/bash205b-007.patch b/bash/bash-2.05b/bash205b-007.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bash205b-007.patch
diff --git a/bash/bash-2.05b/bashbug-editor.patch b/bash/bash-2.05b/bashbug-editor.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/bashbug-editor.patch
diff --git a/bash/bash-2.05b/builtins-shift.patch b/bash/bash-2.05b/builtins-shift.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/builtins-shift.patch
diff --git a/bash/bash-2.05b/deb-bash-config.patch b/bash/bash-2.05b/deb-bash-config.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/deb-bash-config.patch
diff --git a/bash/bash-2.05b/deb-examples.patch b/bash/bash-2.05b/deb-examples.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/deb-examples.patch
diff --git a/bash/bash-2.05b/execute-cmd.patch b/bash/bash-2.05b/execute-cmd.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/execute-cmd.patch
diff --git a/bash/bash-2.05b/gcc34.patch b/bash/bash-2.05b/gcc34.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/gcc34.patch
diff --git a/bash/bash-2.05b/mailcheck.patch b/bash/bash-2.05b/mailcheck.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/mailcheck.patch
diff --git a/bash/bash-2.05b/man-arithmetic.patch b/bash/bash-2.05b/man-arithmetic.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/man-arithmetic.patch
diff --git a/bash/bash-2.05b/man-bashrc.patch b/bash/bash-2.05b/man-bashrc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/man-bashrc.patch
diff --git a/bash/bash-2.05b/man-fignore.patch b/bash/bash-2.05b/man-fignore.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/man-fignore.patch
diff --git a/bash/bash-2.05b/privmode.patch b/bash/bash-2.05b/privmode.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/privmode.patch
diff --git a/bash/bash-2.05b/rbash-login-shell.patch b/bash/bash-2.05b/rbash-login-shell.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rbash-login-shell.patch
diff --git a/bash/bash-2.05b/rbash-manpage.patch b/bash/bash-2.05b/rbash-manpage.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rbash-manpage.patch
diff --git a/bash/bash-2.05b/report-155436.patch b/bash/bash-2.05b/report-155436.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/report-155436.patch
diff --git a/bash/bash-2.05b/rl-8bit-init.patch b/bash/bash-2.05b/rl-8bit-init.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rl-8bit-init.patch
diff --git a/bash/bash-2.05b/rl-del-backspace-policy.patch b/bash/bash-2.05b/rl-del-backspace-policy.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rl-del-backspace-policy.patch
diff --git a/bash/bash-2.05b/rl-examples.patch b/bash/bash-2.05b/rl-examples.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rl-examples.patch
diff --git a/bash/bash-2.05b/rl-inputrc.patch b/bash/bash-2.05b/rl-inputrc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rl-inputrc.patch
diff --git a/bash/bash-2.05b/rl-slow-multibyte.patch b/bash/bash-2.05b/rl-slow-multibyte.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/rl-slow-multibyte.patch
diff --git a/bash/bash-2.05b/s390-build.patch b/bash/bash-2.05b/s390-build.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/s390-build.patch
diff --git a/bash/bash-2.05b/suspend-segfault.patch b/bash/bash-2.05b/suspend-segfault.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/suspend-segfault.patch
diff --git a/bash/bash-2.05b/various.patch b/bash/bash-2.05b/various.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bash/bash-2.05b/various.patch
diff --git a/bash/bash_2.05b.oe b/bash/bash_2.05b.oe
index 4530fbebb1..4a47ee71f7 100644
--- a/bash/bash_2.05b.oe
+++ b/bash/bash_2.05b.oe
@@ -2,8 +2,36 @@ DEPENDS = "ncurses"
 DESCRIPTION = "An sh-compatible command language interpreter."
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
-	   file://make.patch;patch=1 \
-	   file://configure.patch;patch=1"
+           file://bashbug-editor.patch;patch=1;pnum=0 \
+           file://deb-bash-config.patch;patch=1 \
+           file://deb-examples.patch;patch=1;pnum=0 \
+           file://man-arithmetic.patch;patch=1;pnum=0 \
+           file://man-fignore.patch;patch=1;pnum=0 \
+           file://man-bashrc.patch;patch=1 \
+           file://privmode.patch;patch=1 \
+           file://various.patch;patch=1 \
+           file://report-155436.patch;patch=1;pnum=0 \
+           file://bash205b-001.patch;patch=1;pnum=0 \
+           file://bash205b-002.patch;patch=1;pnum=0 \
+           file://bash205b-003.patch;patch=1;pnum=0 \
+           file://bash205b-004.patch;patch=1;pnum=0 \
+           file://bash205b-005.patch;patch=1;pnum=0 \
+           file://bash205b-006.patch;patch=1;pnum=0 \
+           file://bash205b-007.patch;patch=1;pnum=0 \
+           file://rl-examples.patch;patch=1;pnum=0 \
+           file://rl-inputrc.patch;patch=1 \
+           file://rl-del-backspace-policy.patch;patch=1;pnum=0 \
+           file://rl-8bit-init.patch;patch=1 \
+           file://rl-slow-multibyte.patch;patch=1 \
+           file://s390-build.patch;patch=1;pnum=0 \
+           file://rbash-manpage.patch;patch=1;pnum=0 \
+           file://rbash-login-shell.patch;patch=1 \
+           file://execute-cmd.patch;patch=1 \
+           file://builtins-shift.patch;patch=1;pnum=0 \
+           file://suspend-segfault.patch;patch=1 \
+           file://mailcheck.patch;patch=1 \
+           file://autofoo.patch;patch=1 \
+           file://gcc34.patch;patch=1"
 
 inherit autotools
 
@@ -17,9 +45,10 @@ export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
 export CC_FOR_BUILD = "${BUILD_CC}"
-do_configure_prepend () {
+
+do_configure () {
 	if [ ! -e acinclude.m4 ]; then
 		mv aclocal.m4 acinclude.m4
 	fi
-	support/mkconffiles
+	autotools_do_configure
 }