From 8cd8c0fe31e731523598a2fd44420e9061c0c593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 21 Mar 2021 00:14:15 +0000
Subject: [PATCH] Rebuild bash 5.1 with gcc.

---
 parts.rst                                    |  5 ++++
 sysa/bash-5.1/{checksums => checksums/pass1} |  0
 sysa/bash-5.1/checksums/pass2                |  1 +
 sysa/bash-5.1/{bash-5.1.sh => pass1.sh}      |  1 +
 sysa/bash-5.1/pass2.sh                       | 25 ++++++++++++++++++++
 sysa/run.sh                                  |  2 +-
 sysa/run2.sh                                 |  2 +-
 7 files changed, 34 insertions(+), 2 deletions(-)
 rename sysa/bash-5.1/{checksums => checksums/pass1} (100%)
 create mode 100644 sysa/bash-5.1/checksums/pass2
 rename sysa/bash-5.1/{bash-5.1.sh => pass1.sh} (88%)
 create mode 100755 sysa/bash-5.1/pass2.sh

diff --git a/parts.rst b/parts.rst
index a7d642c1..cf303189 100644
--- a/parts.rst
+++ b/parts.rst
@@ -525,6 +525,11 @@ GCC is a key component of the GNU toolchain and the standard compiler for most p
 
 Only C frontend is built at this stage.
 
+bash 5.1 (gcc)
+==============
+
+Rebuild bash with GCC.
+
 musl 1.2.2
 ==========
 
diff --git a/sysa/bash-5.1/checksums b/sysa/bash-5.1/checksums/pass1
similarity index 100%
rename from sysa/bash-5.1/checksums
rename to sysa/bash-5.1/checksums/pass1
diff --git a/sysa/bash-5.1/checksums/pass2 b/sysa/bash-5.1/checksums/pass2
new file mode 100644
index 00000000..17e41b8d
--- /dev/null
+++ b/sysa/bash-5.1/checksums/pass2
@@ -0,0 +1 @@
+62dd23127c9ccef9706f5a89baab25e4c5f74cb96ed9373843bc97252fbd4f4e  /after/bin/bash
diff --git a/sysa/bash-5.1/bash-5.1.sh b/sysa/bash-5.1/pass1.sh
similarity index 88%
rename from sysa/bash-5.1/bash-5.1.sh
rename to sysa/bash-5.1/pass1.sh
index ca3f394b..5baee039 100755
--- a/sysa/bash-5.1/bash-5.1.sh
+++ b/sysa/bash-5.1/pass1.sh
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
diff --git a/sysa/bash-5.1/pass2.sh b/sysa/bash-5.1/pass2.sh
new file mode 100755
index 00000000..aabfc0b5
--- /dev/null
+++ b/sysa/bash-5.1/pass2.sh
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# 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() {
+        ./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/run.sh b/sysa/run.sh
index 00d98b60..c2fb2df1 100755
--- 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-5.1
+build bash-5.1 pass1.sh checksums/pass1
 
 exec bash run2.sh
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 5fbef92f..737a290b 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -14,7 +14,7 @@ build automake-1.9.6 stage2.sh
 
 build gcc-4.0.4 stage1.sh
 
-build musl-1.2.2
+build bash-5.1 pass2.sh checksums/pass2
 
 build musl-1.2.2