From d4b823c23048ac7307df8af050a85fd238766fd2 Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Thu, 31 Oct 2024 23:41:14 -0400
Subject: [PATCH] Fix ada patch

---
 download-funcs.sh               | 14 +++++---------
 download.sh                     |  2 +-
 patches/gcc/ada-hurd-amd64.diff |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/download-funcs.sh b/download-funcs.sh
index 4ca5f282..c5f24018 100644
--- a/download-funcs.sh
+++ b/download-funcs.sh
@@ -180,15 +180,11 @@ download_glibc() {
         cd ..
 }
 
-download_gcc () {
-   download $GCC_PKG $GCC_URL &&
-        if [ -d "$GCC_SRC" ]; then
-           return 0
-        fi
-   unpack xf $GCC_PKG $GCC_SRC &&
-   pushd $GCC_SRC &&
-   apply_patch $SCRIPT_DIR/patches/gcc/ada-hurd-amd64.diff 1 &&
-   popd
+download_gcc() {
+    download_package $GCC_URL &&
+        pushd $GCC_SRC &&
+        apply_patch $SCRIPT_DIR/patches/gcc/ada-hurd-amd64.diff 1 &&
+        popd
 }
 
 download_sed() {
diff --git a/download.sh b/download.sh
index af1750a5..2a9b2311 100755
--- a/download.sh
+++ b/download.sh
@@ -5,7 +5,7 @@
 
 mkdir -p $SOURCE &&
     pushd $SOURCE &&
-    download_package $GCC_URL &&
+    download_gcc &&
     download_package $BINUTILS_URL &&
     download $FLEX_PKG $FLEX_URL &&
     unpack zxf $FLEX_PKG $FLEX_SRC &&
diff --git a/patches/gcc/ada-hurd-amd64.diff b/patches/gcc/ada-hurd-amd64.diff
index 721ee01c..6a8ede4d 100644
--- a/patches/gcc/ada-hurd-amd64.diff
+++ b/patches/gcc/ada-hurd-amd64.diff
@@ -1,5 +1,5 @@
---- a/src/gcc/ada/Makefile.rtl
-+++ b/src/gcc/ada/Makefile.rtl
+--- a/gcc/ada/Makefile.rtl
++++ b/gcc/ada/Makefile.rtl
 @@ -1674,6 +1674,37 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
    LIBRARY_VERSION := $(LIB_VERSION)
  endif