commit: 67910645710e0ed4fa8a969632dbcd2bb9ab6d32
parent 07528e62404dc52be390aaf648ff1ad8b6adcf12
Author: fosslinux <fosslinux@aussies.space>
Date: Sun, 21 Mar 2021 10:18:22 +1100
Merge pull request #74 from stikonas/bash
Bump bash to 5.1.
Diffstat:
8 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
@@ -14,7 +14,7 @@ f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7 autoconf-2.59.
84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410 automake-1.8.5.tar.bz2
8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d automake-1.9.6.tar.bz2
ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4 bash-2.05b.tar.gz
-3fa9daf85ebf35068f090ce51283ddeeb3c75eb5bc70b1a4a7cb05868bfe06a4 bash-3.2.57.tar.gz
+cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz
e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.tar.bz2
7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095 bison-3.4.1.tar.gz
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 bzip2-1.0.8.tar.gz
diff --git a/parts.rst b/parts.rst
@@ -508,11 +508,11 @@ automake 1.9.6
Latest GNU Automake from 1.9 series. Slightly annoyingly depends itself but it is easy to patch
to make it buildable with 1.8.5. Then we rebuild ``automake-1.9`` with itself.
-bash 3.2.57
-===========
+bash 5.1
+========
Up to this point, our build of ``bash`` could run scripts but could not be used
-interactively. This newer version of ``bash`` compiles without any patches,
+interactively. This new version of ``bash`` compiles without any patches,
provides new features, and is built with GNU readline support so it can be used
-as an interactive shell. ``autoconf-2.57`` is used to regenerate the configure
-script and bison is used to recreate some included generated files.
+as an interactive shell. ``autoconf-2.61`` is used to regenerate the configure
+script and ``bison`` is used to recreate some included generated files.
diff --git a/rootfs.sh b/rootfs.sh
@@ -255,8 +255,8 @@ get_file https://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz
# autoconf 2.61
get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2
-# bash 3.2.57
-get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz
+# bash 5.1
+get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
# automake 1.9.6
get_file https://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2
diff --git a/sysa/bash-3.2.57/bash-3.2.57.sh b/sysa/bash-3.2.57/bash-3.2.57.sh
@@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
- # Remove bison generated files
- rm y.tab.c y.tab.h
-
- # Rebuild configure script
- # Ignore harmless error from autoconf for now
- rm configure
- autoconf-2.57
-}
-
-src_configure() {
- CC=tcc CPPFLAGS="-D HAVE_ALLOCA_H" \
- ./configure --prefix=/after \
- --without-bash-malloc \
- --build=i386-unknown-linux
-}
-
-src_install() {
- install bash ${bindir}
-}
diff --git a/sysa/bash-3.2.57/checksums b/sysa/bash-3.2.57/checksums
@@ -1 +0,0 @@
-62c5acf91b425c3587b498ce7af14fcfed6735db1bfd8d94055a4795aff57b09 /after/bin/bash
diff --git a/sysa/bash-5.1/bash-5.1.sh b/sysa/bash-5.1/bash-5.1.sh
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+ # Remove bison generated files
+ rm y.tab.c y.tab.h
+
+ # Rebuild configure script
+ rm configure
+ autoconf-2.61
+}
+
+src_configure() {
+ CC=tcc CPPFLAGS="-D HAVE_ALLOCA_H" \
+ ./configure --prefix="${PREFIX}" \
+ --without-bash-malloc \
+ --disable-nls \
+ --build=i386-unknown-linux-gnu \
+ --enable-static-link
+}
+
+src_install() {
+ install bash ${bindir}
+}
diff --git a/sysa/bash-5.1/checksums b/sysa/bash-5.1/checksums
@@ -0,0 +1 @@
+abb6aca766109a7dc2aa00ed976540ce631ad45daa11d5091a38c15dd62f1257 /after/bin/bash
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -126,6 +126,6 @@ build help2man-1.36.4
build autoconf-2.61 stage1.sh
build autoconf-2.61 stage2.sh
-build bash-3.2.57
+build bash-5.1
exec bash run2.sh
