Fix ada patch

flavioc · Nov 1, 2024 · d4b823c · d4b823c
1 parent 0d5241e
commit d4b823c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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