From 32ae16e3c38f6e7a51faff9b71a9d0e898bb0579 Mon Sep 17 00:00:00 2001
From: Ribbon <ribbon_45@proton.me>
Date: Fri, 11 Aug 2023 10:42:40 +0000
Subject: [PATCH] Add ant package

---
 bootstrap.sh                    | 13 +++++++++----
 podman/redox-base-containerfile |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 3cb8ec9..38252de 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -207,6 +207,7 @@ osx_homebrew()
 	install_brew_pkg "automake"
 	install_brew_pkg "scons"
 	install_brew_pkg "lua"
+	install_brew_pkg "ant"
 
     install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
 }
@@ -323,7 +324,8 @@ archLinux()
 	clang \
 	perl \
 	doxygen \
-	lua"
+	lua \
+	ant"
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
@@ -395,7 +397,8 @@ ubuntu()
 		perl \
 		doxygen \
 		g++ \
-		lua5.4"
+		lua5.4 \
+		ant"
 	# Not availible for at least ARM hosts
 	case "$host_arch" in
 		x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
@@ -497,7 +500,8 @@ fedora()
 	luajit \
 	make \
 	clang \
-	doxygen ; do rpm -q $pkg > /dev/null || echo $pkg; done)
+	doxygen \
+	ant ; 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
@@ -576,7 +580,8 @@ suse()
 		llvm \
 		clang \
 		doxygen \
-		lua54
+		lua54 \
+		ant
 }
 
 ##############################################################################
diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile
index 657ce17..dec49ca 100644
--- a/podman/redox-base-containerfile
+++ b/podman/redox-base-containerfile
@@ -47,7 +47,8 @@ RUN apt-get update \
 		llvm \
 		clang \
 		perl \
-        doxygen
+        doxygen \
+        ant
 
 # _UID_ must be replaced with the user's uid on host
 # podman root is mapped to your user id on host during build,