From 6cf5b4d3dda4bf93310e09e84254bcbf6f4ed388 Mon Sep 17 00:00:00 2001
From: Ribbon <ribbon_45@proton.me>
Date: Mon, 3 Mar 2025 08:22:10 +0000
Subject: [PATCH] Add gdb and gdb-multiarch on the native and Podman builds

---
 native_bootstrap.sh | 12 +++++++++---
 podman_bootstrap.sh | 10 +++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/native_bootstrap.sh b/native_bootstrap.sh
index 66f55558..81481b17 100755
--- a/native_bootstrap.sh
+++ b/native_bootstrap.sh
@@ -156,6 +156,7 @@ osx_macports()
 	install_macports_pkg "gmake"
 	install_macports_pkg "lua"
 	install_macports_pkg "protobuf-c"
+	install_macports_pkg "gdb +multiarch"
 }
 
 ###############################################################################
@@ -226,6 +227,7 @@ osx_homebrew()
 	install_brew_pkg "lua"
 	install_brew_pkg "ant"
 	install_brew_pkg "protobuf"
+	install_brew_pkg "gdb"
 
     install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
 }
@@ -297,6 +299,7 @@ freebsd()
 	install_freebsd_pkg "scons"
 	install_freebsd_pkg "lua54"
 	install_freebsd_pkg "py-protobuf-compiler"
+	install_freebsd_pkg "gdb"
     set +x
 }
 
@@ -359,7 +362,8 @@ archLinux()
 	lua \
 	ant \
 	protobuf \
-	rsync"
+	rsync \
+	gdb"
 
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
@@ -462,7 +466,7 @@ ubuntu()
 		xxd \
 		zip \
 		zstd \
-		"
+		gdb-multiarch"
 	# Not availible for at least ARM hosts
 	case "$host_arch" in
 		x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
@@ -596,7 +600,8 @@ fedora()
 	ant \
 	protobuf-compiler \
 	zstd \
-	lzip ; do rpm -q $pkg > /dev/null || echo $pkg; done)
+	lzip \
+	gdb ; do rpm -q $pkg > /dev/null || echo $pkg; done)
 	# If the list of packages is not empty, install missing
 	COUNT=$(echo $PKGS | wc -w)
 	if [ $COUNT -ne 0 ]; then
@@ -658,6 +663,7 @@ suse()
 		"lua54"
 		"ant"
 		"protobuf"
+		"gdb-multiarch"
 	)
 
 	if [ -z "$(which git)" ]; then
diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh
index 8ef17850..4a382352 100755
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@@ -102,6 +102,7 @@ osx_macports()
 	install_macports_pkg "curl"
 	install_macports_pkg "osxfuse"
 	install_macports_pkg "podman"
+	install_macports_pkg "gdb +multiarch"
 
 	if [ "$1" == "qemu" ]; then
         install_macports_pkg "qemu" "qemu-system-x86_64"
@@ -133,6 +134,7 @@ osx_homebrew()
 	install_brew_pkg "fuse-overlayfs"
 	install_brew_pkg "slirp4netns"
 	install_brew_pkg "podman"
+	install_brew_pkg "gdb"
 
 	if [ "$1" == "qemu" ]; then
         install_brew_pkg "qemu" "qemu-system-x86_64"
@@ -161,6 +163,7 @@ freebsd()
 	install_freebsd_pkg "curl"
 	install_freebsd_pkg "fusefs-libs3"
     install_freebsd_pkg "podman"
+	install_freebsd_pkg "gdb"
 
 
 	if [ "$1" == "qemu" ]; then
@@ -184,7 +187,7 @@ archLinux()
 {
 
 	echo "Detected Arch Linux"
-	packages="git make curl fuse3 fuse-overlayfs slirp4netns podman"
+	packages="git make curl fuse3 fuse-overlayfs slirp4netns podman gdb"
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
@@ -218,7 +221,7 @@ ubuntu()
 	sudo "$2" update
 	echo "Installing required packages..."
 	sudo "$2" install \
-		podman curl git make pkg-config fuse3 libfuse3-dev fuse-overlayfs slirp4netns
+		podman curl git make pkg-config fuse3 libfuse3-dev fuse-overlayfs slirp4netns gdb-multiarch
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Installing QEMU..."
@@ -284,7 +287,7 @@ fedora()
 	fi
 		
 	# Use rpm -q <package> to check if it's already installed
-	PKGS=$(for pkg in podman curl make fuse3 fuse-overlayfs slirp4netns; do rpm -q $pkg > /dev/null || echo $pkg; done)
+	PKGS=$(for pkg in podman curl make fuse3 fuse-overlayfs slirp4netns gdb; do rpm -q $pkg > /dev/null || echo $pkg; done)
 	# If the list of packages is not empty, install missing
 	COUNT=$(echo $PKGS | wc -w)
 	if [ $COUNT -ne 0 ]; then
@@ -310,6 +313,7 @@ suse()
 		"fuse-overlayfs"
 		"slirp4netns"
 		"podman"
+		"gdb-multiarch"
 	)
 
 	if [ -z "$(which git)" ]; then