librewolf-bot/linux
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

try using ultra-recent rust, hopefully fixing infinite hang issues on aarch64

Browse source
This commit is contained in:
ohfp 2021-12-14 12:59:05 +01:00
parent a23f3c6390
commit 33d481e09b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/1_Install_Dependencies.sh
View file

@ -38,10 +38,11 @@ _DEPENDENCIES="wget git xvfb \
python \ python \
libffi-dev \ libffi-dev \
nodejs-mozilla \ nodejs-mozilla \
cargo \
rustc \
nasm-mozilla" nasm-mozilla"
# cargo \
# rustc \
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
# Installs Dependencies # Installs Dependencies
@ -66,6 +67,7 @@ else
fi fi
# we need a more recent rust # we need a more recent rust
# curl https://sh.rustup.rs -o rustup.sh # …to test if a fix in 1.57 magically fixes aarch64 hanging
# bash rustup.sh -y curl https://sh.rustup.rs -o rustup.sh
# source /root/.cargo/env bash rustup.sh -y
source /root/.cargo/env

2
scripts/4_Build_Binary_Tarball.sh
View file

@ -17,7 +17,7 @@ export DEB_BUILD_HARDENING_PIE=1
# export PATH=/usr/lib/nasm-mozilla/bin:$PATH # export PATH=/usr/lib/nasm-mozilla/bin:$PATH
# add cargo binary to 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 # 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 # might make it easier to maintain changes in build scripts on both sides