From 17e1d6daf7001dfe944b869898b8f4a5682762b9 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 8 Oct 2021 01:41:18 +0200
Subject: [PATCH] v93.0-1

---
 .../armhf-reduce-linker-memory-use.patch      | 20 +++++++------------
 scripts/1_Install_Dependencies.sh             |  2 +-
 scripts/3_Configure_Source_Code.sh            | 10 +++++-----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/deb_patches/armhf-reduce-linker-memory-use.patch b/deb_patches/armhf-reduce-linker-memory-use.patch
index abeedcc..a9afe2d 100644
--- a/deb_patches/armhf-reduce-linker-memory-use.patch
+++ b/deb_patches/armhf-reduce-linker-memory-use.patch
@@ -5,24 +5,18 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -2349,15 +2349,17 @@
+@@ -2287,10 +2287,12 @@
  set_config("LINKER_KIND", select_linker.KIND)
  
  
--@depends_if(select_linker, target, macos_sdk, target_sysroot_path, multiarch_dir)
-+@depends_if(select_linker, target, macos_sdk, target_sysroot_path, multiarch_dir, host)
+-@depends_if(select_linker, target, target_sysroot, target_multiarch_dir, c_compiler)
++@depends_if(select_linker, target, target_sysroot, target_multiarch_dir, c_compiler, host)
  @imports("os")
--def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir):
-+def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir, host):
+-def linker_ldflags(linker, target, sysroot, multiarch_dir, c_compiler):
++def linker_ldflags(linker, target, sysroot, multiarch_dir, c_compiler, host):
      flags = list((linker and linker.LINKER_FLAG) or [])
-     if target.kernel == "Darwin":
-         if linker and linker.KIND == "ld64":
-             flags.append("-Wl,-syslibroot,%s" % macos_sdk)
-         else:
-             flags.append("-Wl,--sysroot=%s" % macos_sdk)
 +    if host.cpu == "arm":
 +        flags.append("-Wl,--no-keep-memory")
- 
      # rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
-     if sysroot_path and multiarch_dir and target.os != "WASI":
-
+     if sysroot.path and multiarch_dir and target.os != "WASI":
+         for d in ("lib", "usr/lib"):
diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh
index a9d7924..6b6d80b 100755
--- a/scripts/1_Install_Dependencies.sh
+++ b/scripts/1_Install_Dependencies.sh
@@ -58,7 +58,7 @@ if [[ $CARCH == 'x86_64' ]];then
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
     apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main"
     apt-get update
-    apt-get -y install clang-12 libclang-12-dev
+    apt-get -y install clang-13 libclang-13-dev
 else
     apt install -y software-properties-common apt-transport-https ca-certificates
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 80e06b2..ffb50fd 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -105,11 +105,11 @@ else
 # ubuntu seems to recommend this
 ac_add_options --disable-elf-hack
 
-export CC='clang-12'
-export CXX='clang++-12'
-export AR=llvm-ar-12
-export NM=llvm-nm-12
-export RANLIB=llvm-ranlib-12
+export CC='clang-13'
+export CXX='clang++-13'
+export AR=llvm-ar-13
+export NM=llvm-nm-13
+export RANLIB=llvm-ranlib-13
 
 # probably not needed, enabled by default?
 ac_add_options --enable-optimize