From 65dd03e58f88ac082c5c9b3d6e71f054117b0c95 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 11 Aug 2023 16:18:25 +0200
Subject: [PATCH] Move back to the old toolchain for aarch64

Fix #634
---
 kiwixbuild/dependencies/armhf.py | 9 ++++++---
 kiwixbuild/platforms/armhf.py    | 6 +++++-
 kiwixbuild/versions.py           | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/dependencies/armhf.py b/kiwixbuild/dependencies/armhf.py
index 7f0702f..0080f6d 100644
--- a/kiwixbuild/dependencies/armhf.py
+++ b/kiwixbuild/dependencies/armhf.py
@@ -6,6 +6,9 @@ from kiwixbuild.utils import Remotefile
 
 base_url = "https://github.com/tttapa/docker-arm-cross-toolchain/releases/download/0.1.0/"
 
+
+aarch_base_url = 'https://master.dl.sourceforge.net/project/raspberry-pi-cross-compilers/Bonus%20Raspberry%20Pi%20GCC%2064-Bit%20Toolchains/Raspberry%20Pi%20GCC%2064-Bit%20Cross-Compiler%20Toolchains/Stretch/GCC%206.3.0/'
+
 class armv6_toolchain(Dependency):
     dont_skip = True
     neutral = True
@@ -37,8 +40,8 @@ class aarch64_toolchain(Dependency):
     name = "aarch64"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('x-tools-aarch64-rpi3-linux-gnu.tar.xz',
-                             '8be81d3fc47b1b280bf003646d2b623477badec4ec931944131bf412317b6332',
-                             base_url + 'x-tools-aarch64-rpi3-linux-gnu.tar.xz')
+        archive = Remotefile('cross-gcc-6.3.0-pi_64.tar.gz',
+                             '1b048bb8886ad63d21797cd9129fc37b9ea0dfaac7e3c36f888aa16fbec1d320',
+                             aarch_base_url + 'cross-gcc-6.3.0-pi_64.tar.gz')
 
     Builder = NoopBuilder
diff --git a/kiwixbuild/platforms/armhf.py b/kiwixbuild/platforms/armhf.py
index c848f8a..2d1e0ac 100644
--- a/kiwixbuild/platforms/armhf.py
+++ b/kiwixbuild/platforms/armhf.py
@@ -143,11 +143,15 @@ class Armv8Mixed(MixedMixin('armv8_static'), Armv8):
 
 class Aarch64(ArmPlatformInfo):
     build = 'aarch64'
-    arch_full = 'aarch64-rpi3-linux-gnu'
+    arch_full = 'aarch64-linux-gnu'
     toolchain_names = ['aarch64']
     cpu_family = 'aarch64'
     cpu = 'aarch64'
 
+    @property
+    def root_path(self):
+        return self.tlc_source.source_path
+
 class Aarch64Dyn(Aarch64):
     name = 'aarch64_dyn'
     static = False
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 37c9fc6..28d2b53 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '89'
+base_deps_meta_version = '90'
 
 base_deps_versions = {
   'zlib' : '1.2.12',