crystal-git: enable aarch64

3 files changed, 37 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3caf35830d2f..c64a8cb2e2ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = crystal-git
 	pkgdesc = The Crystal Programming Language
-	pkgver = 0.34.0.r228.gf3249054e
+	pkgver = 0.35.0.r12.g01dafa331
 	pkgrel = 1
 	url = http://crystal-lang.org
-	arch = i686
 	arch = x86_64
+	arch = aarch64
 	license = Apache
 	checkdepends = libyaml
 	checkdepends = libxml2
@@ -14,7 +14,6 @@ pkgbase = crystal-git
 	makedepends = git
 	makedepends = libxml2
 	makedepends = llvm
-	makedepends = crystal
 	depends = gc
 	depends = libatomic_ops
 	depends = pcre
@@ -27,6 +26,15 @@ pkgbase = crystal-git
 	conflicts = crystal
 	source = git+https://github.com/crystal-lang/crystal.git
 	sha256sums = SKIP
+	makedepends_x86_64 = crystal
+	source_aarch64 = https://dev.alpinelinux.org/archive/crystal/crystal-0.35.0-aarch64-alpine-linux-musl.tar.gz
+	source_aarch64 = https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9401.patch
+	source_aarch64 = https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9430.patch
+	source_aarch64 = https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9422.patch
+	sha256sums_aarch64 = de903f2b53eec558cb77520cd9d52bde357bffae37fc6120308b4ddd8a7d65f9
+	sha256sums_aarch64 = e478e82388437d86e3d6921e0f1e8786232f472484e77aee393e7b634059b6d0
+	sha256sums_aarch64 = 5198112f76c58954112bc434e1165d1134adef9cc42abcd2d8f45d99e2309303
+	sha256sums_aarch64 = 5044d1a22687c712ee8bfb152fd2336b5333d6709bdb98c9450fbcf19cc5ddad
 
 pkgname = crystal-git
 
diff --git a/.gitignore b/.gitignore
index 798edbecf29e..a490d943c170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 crystal/
+*.patch
diff --git a/PKGBUILD b/PKGBUILD
index fec028190b0b..652ae65caab2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 # Contributor: Mikkel Kroman <mk@maero.dk>
 
 pkgname=crystal-git
-pkgver=0.34.0.r228.gf3249054e
+pkgver=0.35.0.r12.g01dafa331
 pkgrel=1
 pkgdesc="The Crystal Programming Language"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'aarch64')
 url="http://crystal-lang.org"
 license=('Apache')
 depends=('gc' 'libatomic_ops' 'pcre' 'libevent')
-makedepends=('git' 'libxml2' 'llvm' 'crystal')
+makedepends=('git' 'libxml2' 'llvm')
+makedepends_x86_64=('crystal')
 checkdepends=('libyaml' 'libxml2' 'gmp' 'git' 'inetutils')
 optdepends=('shards: To make the crystal deps command work'
             'libyaml: For YAML support'
@@ -18,6 +19,10 @@ optdepends=('shards: To make the crystal deps command work'
 conflicts=('crystal')
 provides=('crystal')
 source=("git+https://github.com/crystal-lang/crystal.git")
+source_aarch64=("https://dev.alpinelinux.org/archive/crystal/crystal-0.35.0-aarch64-alpine-linux-musl.tar.gz"
+	"https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9401.patch"
+	"https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9430.patch"
+	"https://patch-diff.githubusercontent.com/raw/crystal-lang/crystal/pull/9422.patch")
 
 pkgver() {
   cd "$srcdir/${pkgname/-git/}"
@@ -27,6 +32,19 @@ pkgver() {
   )
 }
 
+prepare() {
+  cd "$srcdir/${pkgname/-git/}"
+
+  if [ "$CARCH" = "aarch64" ]; then
+    git clean -f
+    patch -p1 < "$srcdir/9401.patch"
+    patch -p1 < "$srcdir/9430.patch"
+    patch -p1 < "$srcdir/9422.patch"
+    export PATH="$srcdir/crystal-0.35.0-aarch64-alpine-linux-musl/bin:$PATH"
+    export EXPORT_CC="CC=cc" # prevent lld usage, broken on  aarch64
+  fi
+}
+
 build() {
   cd "$srcdir/${pkgname/-git/}"
 
@@ -72,3 +90,7 @@ package() {
 }
 
 sha256sums=('SKIP')
+sha256sums_aarch64=('de903f2b53eec558cb77520cd9d52bde357bffae37fc6120308b4ddd8a7d65f9'
+                    'e478e82388437d86e3d6921e0f1e8786232f472484e77aee393e7b634059b6d0'
+                    '5198112f76c58954112bc434e1165d1134adef9cc42abcd2d8f45d99e2309303'
+                    '5044d1a22687c712ee8bfb152fd2336b5333d6709bdb98c9450fbcf19cc5ddad')