From 33d481e09bbb8fb2b565db9e29e5056d340630e0 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 14 Dec 2021 12:59:05 +0100
Subject: [PATCH] try using ultra-recent rust, hopefully fixing infinite hang
 issues on aarch64

---
 scripts/1_Install_Dependencies.sh | 12 +++++++-----
 scripts/4_Build_Binary_Tarball.sh |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh
index a125332..0799ea1 100755
--- a/scripts/1_Install_Dependencies.sh
+++ b/scripts/1_Install_Dependencies.sh
@@ -38,10 +38,11 @@ _DEPENDENCIES="wget git xvfb \
         python \
         libffi-dev \
         nodejs-mozilla \
-        cargo \
-        rustc \
         nasm-mozilla"
 
+        # cargo \
+        # rustc \
+
 export DEBIAN_FRONTEND=noninteractive
 
 # Installs Dependencies
@@ -66,6 +67,7 @@ else
 fi
 
 # we need a more recent rust
-# curl https://sh.rustup.rs -o rustup.sh
-# bash rustup.sh -y
-# source /root/.cargo/env
+# …to test if a fix in 1.57 magically fixes aarch64 hanging
+curl https://sh.rustup.rs -o rustup.sh
+bash rustup.sh -y
+source /root/.cargo/env
diff --git a/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh
index cb039e6..28443f7 100755
--- a/scripts/4_Build_Binary_Tarball.sh
+++ b/scripts/4_Build_Binary_Tarball.sh
@@ -17,7 +17,7 @@ export DEB_BUILD_HARDENING_PIE=1
 # export PATH=/usr/lib/nasm-mozilla/bin:$PATH
 
 # add cargo binary to path
-# source /root/.cargo/env
+source /root/.cargo/env
 
 # we do change / unset some of them later, but setting them as set by Arch
 # might make it easier to maintain changes in build scripts on both sides