From e91a3ab2d6ee466de8c0ce4e6783f0341ea7ccee Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sat, 21 Oct 2023 00:25:23 -0400
Subject: [PATCH 1/2] Enhancement: Document building on Arch

This mainly makes it easy to locally build an Arch image for
testing.
---
 script/bootstrap | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/script/bootstrap b/script/bootstrap
index 1892ba8..32d9110 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1505,6 +1505,33 @@ function bootstrapOnFuntoo ()
         make
 }
 
+function bootstrapOnArch ()
+{
+  pacman -Sy --noconfirm \
+        cmake \
+        boost \
+        llvm \
+        clang \
+        gcc \
+        sdl \
+        sdl2 \
+        expat \
+        gtk3 \
+        libglvnd \
+        mesa \
+        python \
+        autoconf \
+        automake \
+        freeglut \
+        git \
+        libjpeg-turbo \
+        libpng \
+        libvorbis \
+        libxmu \
+        openal \
+        make
+}
+
 case "${LINUX_ID}" in
   "debian")
     bootstrapOnDebian
@@ -1542,6 +1569,9 @@ case "${LINUX_ID}" in
   "funtoo")
     bootstrapOnFuntoo
     ;;
+  "arch")
+    bootstrapOnArch
+    ;;
   *)
     echo "Sorry, unrecognized/unsupported Linux distribution"
     exit 2

From e4a64a10e9cbb70034f7ba3cffb6aa94f6b3d1d6 Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sun, 29 Oct 2023 00:46:34 -0400
Subject: [PATCH 2/2] Peer Review: use base-devel

Use the base-devel package. Fewer packages are requried to be
specified then.

- Remove autoconf/automake. They're no longer used any way.
---
 script/bootstrap | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/script/bootstrap b/script/bootstrap
index 32d9110..a5c1fc5 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1507,12 +1507,16 @@ function bootstrapOnFuntoo ()
 
 function bootstrapOnArch ()
 {
+  # NOTE: Arch requires GCC 12 right now
+  # also installing latest GCC.
   pacman -Sy --noconfirm \
+        base-devel \
         cmake \
         boost \
         llvm \
         clang \
         gcc \
+        gcc12 \
         sdl \
         sdl2 \
         expat \
@@ -1520,8 +1524,6 @@ function bootstrapOnArch ()
         libglvnd \
         mesa \
         python \
-        autoconf \
-        automake \
         freeglut \
         git \
         libjpeg-turbo \