From 5c1000a527e320f5cb2f0e8c2f6fd2e5dd332ec2 Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Thu, 19 Dec 2024 00:32:23 -0500
Subject: [PATCH] Download binutils-gdb from git to compile GDB

---
 download-funcs.sh   | 376 ++++++++++++++++++++++----------------------
 download.sh         |   1 +
 package-versions.sh |   3 +
 3 files changed, 194 insertions(+), 186 deletions(-)

diff --git a/download-funcs.sh b/download-funcs.sh
index c5f24018..7f2daedc 100644
--- a/download-funcs.sh
+++ b/download-funcs.sh
@@ -36,11 +36,11 @@ PERL_CROSS_URL=https://github.com/arsv/perl-cross/raw/releases/$PERL_CROSS_PKG
 PERL_URL=https://www.cpan.org/src/5.0/$PERL_PKG
 
 unpack() {
-    if [ -d "$3" ]; then
-        return 0
-    fi
-    print_info "unpacking $2" &&
-        tar $1 $2
+  if [ -d "$3" ]; then
+    return 0
+  fi
+  print_info "unpacking $2" &&
+    tar $1 $2
 }
 
 DOWNLOAD_CACHE_DIRECTORY=~/.cache/cross-hurd
@@ -48,283 +48,287 @@ CACHE_DOWNLOADS=1
 CACHE_GIT=1
 
 download() {
-    if [ -f $1 ]; then
-        return 0
-    fi
-    if [ -n "$CACHE_DOWNLOADS" ]; then
-        mkdir -p $DOWNLOAD_CACHE_DIRECTORY
-        pushd $DOWNLOAD_CACHE_DIRECTORY &&
-            (test -f $1 || wget $2) &&
-            popd &&
-            cp $DOWNLOAD_CACHE_DIRECTORY/$1 .
-    else
-        wget $2
-    fi
+  if [ -f $1 ]; then
+    return 0
+  fi
+  if [ -n "$CACHE_DOWNLOADS" ]; then
+    mkdir -p $DOWNLOAD_CACHE_DIRECTORY
+    pushd $DOWNLOAD_CACHE_DIRECTORY &&
+      (test -f $1 || wget $2) &&
+      popd &&
+      cp $DOWNLOAD_CACHE_DIRECTORY/$1 .
+  else
+    wget $2
+  fi
 }
 
 # $1 - url of the package
 download_package() {
-    local url=$1 &&
-        local package_file=$(basename $url) &&
-        download $package_file $url &&
-        local dir_name=$(basename $(basename $(basename $package_file .tar.gz) .tar.xz) .tar.bz2) &&
-        local extension="${package_file##.*}" &&
-        unpack "xf" $package_file $dir_name
+  local url=$1 &&
+    local package_file=$(basename $url) &&
+    download $package_file $url &&
+    local dir_name=$(basename $(basename $(basename $package_file .tar.gz) .tar.xz) .tar.bz2) &&
+    local extension="${package_file##.*}" &&
+    unpack "xf" $package_file $dir_name
 }
 
 download_from_git() {
-    dir=$1
-    repo=$2
-    branch=$3
-    add_branch=""
-    if [ -n "$branch" ]; then
-        add_branch="--branch $branch"
-    fi
-    (if [ -d $dir ]; then
+  dir=$1
+  repo=$2
+  branch=$3
+  add_branch=""
+  if [ -n "$branch" ]; then
+    add_branch="--branch $branch"
+  fi
+  (if [ -d $dir ]; then
+    pushd $dir &&
+      git reset --hard &&
+      git pull &&
+      local git_result=$?
+    popd &&
+      return $git_result
+  elif [ -n "$CACHE_GIT" ]; then
+    mkdir -p $DOWNLOAD_CACHE_DIRECTORY &&
+      pushd $DOWNLOAD_CACHE_DIRECTORY &&
+      (if [ -d $dir ]; then
         pushd $dir &&
-            git reset --hard &&
-            git pull &&
-            local git_result=$?
-        popd &&
-            return $git_result
-    elif [ -n "$CACHE_GIT" ]; then
-        mkdir -p $DOWNLOAD_CACHE_DIRECTORY &&
-            pushd $DOWNLOAD_CACHE_DIRECTORY &&
-            (if [ -d $dir ]; then
-                pushd $dir &&
-                    git reset --hard &&
-                    git pull &&
-                    popd
-            else
-                git clone --depth=1 $repo $add_branch $dir
-            fi) &&
-            popd &&
-            ln -sf $DOWNLOAD_CACHE_DIRECTORY/$dir .
-    else
-        git clone --depth=1 $repo
-    fi)
+          git reset --hard &&
+          git pull &&
+          popd
+      else
+        git clone --depth=1 $repo $add_branch $dir
+      fi) &&
+      popd &&
+      ln -sf $DOWNLOAD_CACHE_DIRECTORY/$dir .
+  else
+    git clone --depth=1 $repo
+  fi)
 }
 
 download_gnumach() {
-    download_from_git gnumach git://git.savannah.gnu.org/hurd/gnumach.git &&
-        pushd gnumach &&
-        apply_patch $SCRIPT_DIR/patches/gnumach/50_initrd.patch 1 &&
-        apply_patch $SCRIPT_DIR/patches/gnumach/79_dde-debian.patch 1 &&
-        popd
+  download_from_git gnumach git://git.savannah.gnu.org/hurd/gnumach.git &&
+    pushd gnumach &&
+    apply_patch $SCRIPT_DIR/patches/gnumach/50_initrd.patch 1 &&
+    apply_patch $SCRIPT_DIR/patches/gnumach/79_dde-debian.patch 1 &&
+    popd
 }
 
 download_netdde() {
-    download_from_git netdde git://git.savannah.gnu.org/hurd/incubator.git dde_net &&
-        pushd netdde &&
-        apply_patch $SCRIPT_DIR/patches/netdde/machdev.patch 1 &&
-        apply_patch $SCRIPT_DIR/patches/netdde/crypt.patch 1 &&
-        apply_patch $SCRIPT_DIR/patches/netdde/csum.patch 1 &&
-        popd
+  download_from_git netdde git://git.savannah.gnu.org/hurd/incubator.git dde_net &&
+    pushd netdde &&
+    apply_patch $SCRIPT_DIR/patches/netdde/machdev.patch 1 &&
+    apply_patch $SCRIPT_DIR/patches/netdde/crypt.patch 1 &&
+    apply_patch $SCRIPT_DIR/patches/netdde/csum.patch 1 &&
+    popd
 }
 
 download_mig() {
-    download_from_git mig git://git.savannah.gnu.org/hurd/mig.git
+  download_from_git mig git://git.savannah.gnu.org/hurd/mig.git
 }
 
 download_hurd() {
-    download_from_git hurd git://git.savannah.gnu.org/hurd/hurd.git &&
-        pushd hurd &&
-        apply_patch $SCRIPT_DIR/patches/hurd/link-rump.patch 1 &&
-        popd
+  download_from_git hurd git://git.savannah.gnu.org/hurd/hurd.git &&
+    pushd hurd &&
+    apply_patch $SCRIPT_DIR/patches/hurd/link-rump.patch 1 &&
+    popd
 }
 
 download_rumpkernel() {
-    download_from_git rumpkernel https://salsa.debian.org/hurd-team/rumpkernel.git
+  download_from_git rumpkernel https://salsa.debian.org/hurd-team/rumpkernel.git
 }
 
 download_libacpica() {
-    download_from_git libacpica https://salsa.debian.org/hurd-team/libacpica.git
+  download_from_git libacpica https://salsa.debian.org/hurd-team/libacpica.git
 }
 
 download_dde() {
-    download_from_git dde git://git.savannah.gnu.org/hurd/incubator.git dde &&
-        pushd dde &&
-        apply_patch $SCRIPT_DIR/patches/dde/gcc-14.patch 1 &&
-        popd
+  download_from_git dde git://git.savannah.gnu.org/hurd/incubator.git dde &&
+    pushd dde &&
+    apply_patch $SCRIPT_DIR/patches/dde/gcc-14.patch 1 &&
+    popd
+}
+
+download_binutils_gdb() {
+  download_from_git binutils-gdb git://sourceware.org/git/binutils-gdb.git
 }
 
 download_ca_certificates() {
-    download_from_git ca-certificates $CA_CERTIFICATES_URL
+  download_from_git ca-certificates $CA_CERTIFICATES_URL
 }
 
 apply_patch() {
-    print_info "Using patch $1 (level: $2)"
-    if patch -f -Np$2 --dry-run <$1 >/dev/null 2>&1; then
-        patch -Np$2 <$1 || exit 1
-    else
-        echo "Cannot apply patch!"
-    fi
+  print_info "Using patch $1 (level: $2)"
+  if patch -f -Np$2 --dry-run <$1 >/dev/null 2>&1; then
+    patch -Np$2 <$1 || exit 1
+  else
+    echo "Cannot apply patch!"
+  fi
 }
 
 download_glibc() {
-    (if [ ! -d glibc ]; then
-        git clone --depth=1 git://sourceware.org/git/glibc.git
-    fi) &&
-        cd glibc &&
-        git reset --hard &&
-        git pull &&
-        git checkout $GLIBC_TAG &&
-        apply_patch $SCRIPT_DIR/patches/glibc/tg-bits_atomic.h_multiple_threads.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/tg-unlockpt-chroot.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/local-clock_gettime_MONOTONIC.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/submitted-AF_LINK.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/unsubmitted-prof-eintr.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/unsubmitted-getaux_at_secure.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/local-static_pthread_setcancelstate.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/glibc/tg-mach-hurd-link.diff 1 &&
-        cd ..
+  (if [ ! -d glibc ]; then
+    git clone --depth=1 git://sourceware.org/git/glibc.git
+  fi) &&
+    cd glibc &&
+    git reset --hard &&
+    git pull &&
+    git checkout $GLIBC_TAG &&
+    apply_patch $SCRIPT_DIR/patches/glibc/tg-bits_atomic.h_multiple_threads.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/tg-unlockpt-chroot.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/local-clock_gettime_MONOTONIC.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/submitted-AF_LINK.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/unsubmitted-prof-eintr.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/unsubmitted-getaux_at_secure.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/local-static_pthread_setcancelstate.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/glibc/tg-mach-hurd-link.diff 1 &&
+    cd ..
 }
 
 download_gcc() {
-    download_package $GCC_URL &&
-        pushd $GCC_SRC &&
-        apply_patch $SCRIPT_DIR/patches/gcc/ada-hurd-amd64.diff 1 &&
-        popd
+  download_package $GCC_URL &&
+    pushd $GCC_SRC &&
+    apply_patch $SCRIPT_DIR/patches/gcc/ada-hurd-amd64.diff 1 &&
+    popd
 }
 
 download_sed() {
-    download $SED_PKG $SED_URL &&
-        if [ -d "$SED_SRC" ]; then
-            return 0
-        fi
-    unpack xf $SED_PKG $SED_SRC
+  download $SED_PKG $SED_URL &&
+    if [ -d "$SED_SRC" ]; then
+      return 0
+    fi
+  unpack xf $SED_PKG $SED_SRC
 }
 
 download_ncurses() {
-    download $NCURSES_PKG $NCURSES_URL &&
-        if [ -d "$NCURSES_SRC" ]; then
-            return 0
-        fi
-    unpack zxf $NCURSES_PKG $NCURSES_SRC
+  download $NCURSES_PKG $NCURSES_URL &&
+    if [ -d "$NCURSES_SRC" ]; then
+      return 0
+    fi
+  unpack zxf $NCURSES_PKG $NCURSES_SRC
 }
 
 download_libedit() {
-    download $LIBEDIT_PKG $LIBEDIT_URL &&
-        unpack zxf $LIBEDIT_PKG $LIBEDIT_SRC
+  download $LIBEDIT_PKG $LIBEDIT_URL &&
+    unpack zxf $LIBEDIT_PKG $LIBEDIT_SRC
 }
 
 download_libtirpc() {
-    download_package $LIBTIRPC_URL &&
-        pushd $LIBTIRPC_SRC &&
-        apply_patch $SCRIPT_DIR/patches/libtirpc/03-kfreebsd.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/libtirpc/05-hurd-port.diff 1 &&
-        apply_patch $SCRIPT_DIR/patches/libtirpc/06-hurd-client-port.diff 1 &&
-        popd
+  download_package $LIBTIRPC_URL &&
+    pushd $LIBTIRPC_SRC &&
+    apply_patch $SCRIPT_DIR/patches/libtirpc/03-kfreebsd.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/libtirpc/05-hurd-port.diff 1 &&
+    apply_patch $SCRIPT_DIR/patches/libtirpc/06-hurd-client-port.diff 1 &&
+    popd
 }
 
 download_make() {
-    download $MAKE_PKG $MAKE_URL &&
-        if [ -d "$MAKE_SRC" ]; then
-            return 0
-        fi
-    unpack xf $MAKE_PKG $MAKE_SRC
+  download $MAKE_PKG $MAKE_URL &&
+    if [ -d "$MAKE_SRC" ]; then
+      return 0
+    fi
+  unpack xf $MAKE_PKG $MAKE_SRC
 }
 
 download_grep() {
-    download $GREP_PKG $GREP_URL &&
-        if [ -d "$GREP_SRC" ]; then
-            return 0
-        fi
-    unpack xf $GREP_PKG $GREP_SRC
-    pushd $GREP_SRC &&
-        apply_patch $SCRIPT_DIR/patches/grep/gnulib-hurd-x86_64.patch 1 &&
-        popd
+  download $GREP_PKG $GREP_URL &&
+    if [ -d "$GREP_SRC" ]; then
+      return 0
+    fi
+  unpack xf $GREP_PKG $GREP_SRC
+  pushd $GREP_SRC &&
+    apply_patch $SCRIPT_DIR/patches/grep/gnulib-hurd-x86_64.patch 1 &&
+    popd
 }
 
 download_gawk() {
-    download $GAWK_PKG $GAWK_URL &&
-        if [ -d "$GAWK_SRC" ]; then
-            return 0
-        fi
-    unpack xf $GAWK_PKG $GAWK_SRC
+  download $GAWK_PKG $GAWK_URL &&
+    if [ -d "$GAWK_SRC" ]; then
+      return 0
+    fi
+  unpack xf $GAWK_PKG $GAWK_SRC
 }
 
 download_less() {
-    download $LESS_PKG $LESS_URL &&
-        unpack xf $LESS_PKG $LESS_SRC
+  download $LESS_PKG $LESS_URL &&
+    unpack xf $LESS_PKG $LESS_SRC
 }
 
 download_file() {
-    download $FILE_PKG $FILE_URL &&
-        unpack xf $FILE_PKG $FILE_SRC
+  download $FILE_PKG $FILE_URL &&
+    unpack xf $FILE_PKG $FILE_SRC
 }
 
 download_dash() {
-    download $DASH_PKG $DASH_URL &&
-        if [ -d $DASH_SRC ]; then
-            return 0
-        fi
-    unpack xf $DASH_PKG $DASH_SRC
-    pushd $DASH_SRC &&
-        apply_patch $SCRIPT_DIR/patches/dash/dash-path-max.patch 1 &&
-        popd
+  download $DASH_PKG $DASH_URL &&
+    if [ -d $DASH_SRC ]; then
+      return 0
+    fi
+  unpack xf $DASH_PKG $DASH_SRC
+  pushd $DASH_SRC &&
+    apply_patch $SCRIPT_DIR/patches/dash/dash-path-max.patch 1 &&
+    popd
 }
 
 download_libpciaccess() {
-    download $LIBPCIACCESS_PKG $LIBPCIACCESS_URL &&
-        if [ -d $LIBPCIACCESS_SRC ]; then
-            return 0
-        fi
-    unpack xf $LIBPCIACCESS_PKG $LIBPCIACCESS_SRC
+  download $LIBPCIACCESS_PKG $LIBPCIACCESS_URL &&
+    if [ -d $LIBPCIACCESS_SRC ]; then
+      return 0
+    fi
+  unpack xf $LIBPCIACCESS_PKG $LIBPCIACCESS_SRC
 }
 
 download_libxcrypt() {
-    download $LIBXCRYPT_PKG $LIBXCRYPT_URL &&
-        if [ -d $LIBXCRYPT_SRC ]; then
-            return 0
-        fi
-    unpack xf $LIBXCRYPT_PKG $LIBXCRYPT_SRC
+  download $LIBXCRYPT_PKG $LIBXCRYPT_URL &&
+    if [ -d $LIBXCRYPT_SRC ]; then
+      return 0
+    fi
+  unpack xf $LIBXCRYPT_PKG $LIBXCRYPT_SRC
 }
 
 download_parted() {
-    download $PARTED_PKG $PARTED_URL &&
-        if [ -d $PARTED_SRC ]; then
-            return 0
-        fi
-    unpack xf $PARTED_PKG $PARTED_SRC
+  download $PARTED_PKG $PARTED_URL &&
+    if [ -d $PARTED_SRC ]; then
+      return 0
+    fi
+  unpack xf $PARTED_PKG $PARTED_SRC
 }
 
 download_dmidecode() {
-    download $DMIDECODE_PKG $DMIDECODE_URL &&
-        if [ -d $DMIDECODE_SRC ]; then
-            return 0
-        fi
-    unpack xf $DMIDECODE_PKG $DMIDECODE_SRC
+  download $DMIDECODE_PKG $DMIDECODE_URL &&
+    if [ -d $DMIDECODE_SRC ]; then
+      return 0
+    fi
+  unpack xf $DMIDECODE_PKG $DMIDECODE_SRC
 }
 
 download_findutils() {
-    download $FINDUTILS_PKG $FINDUTILS_URL &&
-        if [ -d $FINDUTILS_SRC ]; then
-            return 0
-        fi
-    unpack xf $FINDUTILS_PKG $FINDUTILS_SRC
+  download $FINDUTILS_PKG $FINDUTILS_URL &&
+    if [ -d $FINDUTILS_SRC ]; then
+      return 0
+    fi
+  unpack xf $FINDUTILS_PKG $FINDUTILS_SRC
 }
 
 download_iana_etc() {
-    download $IANA_ETC_PKG $IANA_ETC_URL &&
-        unpack xf $IANA_ETC_PKG $IANA_ETC_SRC
+  download $IANA_ETC_PKG $IANA_ETC_URL &&
+    unpack xf $IANA_ETC_PKG $IANA_ETC_SRC
 }
 
 download_inetutils() {
-    download_package $INETUTILS_URL &&
-        pushd $INETUTILS_SRC &&
-        apply_patch $SCRIPT_DIR/patches/inetutils/hurd-gcc14.patch 1 &&
-        popd
+  download_package $INETUTILS_URL &&
+    pushd $INETUTILS_SRC &&
+    apply_patch $SCRIPT_DIR/patches/inetutils/hurd-gcc14.patch 1 &&
+    popd
 }
 
 download_wget() {
-    download $WGET_PKG $WGET_URL &&
-        unpack xf $WGET_PKG $WGET_SRC
+  download $WGET_PKG $WGET_URL &&
+    unpack xf $WGET_PKG $WGET_SRC
 }
 
 download_perl() {
-    download $PERL_CROSS_PKG $PERL_CROSS_URL &&
-        unpack xf $PERL_CROSS_PKG $PERL_CROSS_SRC &&
-        download $PERL_PKG $PERL_URL &&
-        unpack xf $PERL_PKG $PERL_SRC
+  download $PERL_CROSS_PKG $PERL_CROSS_URL &&
+    unpack xf $PERL_CROSS_PKG $PERL_CROSS_SRC &&
+    download $PERL_PKG $PERL_URL &&
+    unpack xf $PERL_PKG $PERL_SRC
 }
diff --git a/download.sh b/download.sh
index 5e39fcf8..cee308e0 100755
--- a/download.sh
+++ b/download.sh
@@ -73,4 +73,5 @@ mkdir -p $SOURCE &&
   download_glibc &&
   download_libacpica &&
   download_rumpkernel &&
+  download_binutils_gdb &&
   echo "Download complete."
diff --git a/package-versions.sh b/package-versions.sh
index dac2b4bd..d81938fc 100644
--- a/package-versions.sh
+++ b/package-versions.sh
@@ -140,3 +140,6 @@ HTOP_VERSION=3.3.0
 HTOP_SRC=htop-$HTOP_VERSION
 HTOP_PKG=$HTOP_SRC.tar.xz
 HTOP_URL=https://github.com/htop-dev/htop/releases/download/$HTOP_VERSION/$HTOP_PKG
+
+# gdb
+GDB_SRC=binutils-gdb