smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move back to the old toolchain for aarch64 

Fix #634
This commit is contained in:
Matthieu Gautier 2023-08-11 16:18:25 +02:00
parent 75a1963572
commit 65dd03e58f
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiwixbuild/dependencies/armhf.py
View File

@ -6,6 +6,9 @@ from kiwixbuild.utils import Remotefile
base_url = "https://github.com/tttapa/docker-arm-cross-toolchain/releases/download/0.1.0/" 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): class armv6_toolchain(Dependency):
dont_skip = True dont_skip = True
neutral = True neutral = True
@ -37,8 +40,8 @@ class aarch64_toolchain(Dependency):
name = "aarch64" name = "aarch64"
class Source(ReleaseDownload): class Source(ReleaseDownload):
archive = Remotefile('x-tools-aarch64-rpi3-linux-gnu.tar.xz', archive = Remotefile('cross-gcc-6.3.0-pi_64.tar.gz',
'8be81d3fc47b1b280bf003646d2b623477badec4ec931944131bf412317b6332', '1b048bb8886ad63d21797cd9129fc37b9ea0dfaac7e3c36f888aa16fbec1d320',
base_url + 'x-tools-aarch64-rpi3-linux-gnu.tar.xz') aarch_base_url + 'cross-gcc-6.3.0-pi_64.tar.gz')
Builder = NoopBuilder Builder = NoopBuilder

6
kiwixbuild/platforms/armhf.py
View File

@ -143,11 +143,15 @@ class Armv8Mixed(MixedMixin('armv8_static'), Armv8):
class Aarch64(ArmPlatformInfo): class Aarch64(ArmPlatformInfo):
build = 'aarch64' build = 'aarch64'
arch_full = 'aarch64-rpi3-linux-gnu' arch_full = 'aarch64-linux-gnu'
toolchain_names = ['aarch64'] toolchain_names = ['aarch64']
cpu_family = 'aarch64' cpu_family = 'aarch64'
cpu = 'aarch64' cpu = 'aarch64'
@property
def root_path(self):
return self.tlc_source.source_path
class Aarch64Dyn(Aarch64): class Aarch64Dyn(Aarch64):
name = 'aarch64_dyn' name = 'aarch64_dyn'
static = False static = False

2
kiwixbuild/versions.py
View File

@ -39,7 +39,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '89' base_deps_meta_version = '90'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.12', 'zlib' : '1.2.12',