From d75cdc680db8a366e6af42c1a0c4378db60eeead Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sun, 24 Nov 2019 13:27:40 +0100
Subject: community/neovim: enable aarch64

---
 community/neovim/APKBUILD | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/community/neovim/APKBUILD b/community/neovim/APKBUILD
index ad31fec88ca..9bbcf7b7a44 100644
--- a/community/neovim/APKBUILD
+++ b/community/neovim/APKBUILD
@@ -14,13 +14,19 @@
 # TODO: Try to trim the base package to include only common syntax files etc.
 pkgname=neovim
 pkgver=0.4.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Vim-fork focused on extensibility and agility"
 url="https://neovim.io"
-arch="all !aarch64 !s390x" # s390x|aarch64: needs luajit
+arch="all !s390x" # s390x: needs luajit
 license="Apache-2.0 custom"
 makedepends="cmake gettext-dev gperf libtermkey-dev libuv-dev libvterm-dev
-	lua5.1-lpeg lua5.1-mpack msgpack-c-dev unibilium-dev luajit-dev libluv-dev"
+	lua5.1-lpeg lua5.1-mpack msgpack-c-dev unibilium-dev libluv-dev"
+# Build neovim with lua instead of luajit on aarch64
+# See https://github.com/neovim/neovim/issues/7879
+case "$CARCH" in
+	aarch64) makedepends="$makedepends lua5.1-dev lua5.1-bitop" ;;
+	*) makedepends="$makedepends luajit-dev" ;;
+esac
 subpackages="$pkgname-lang $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/neovim/neovim/archive/v$pkgver.tar.gz
 	nodoc.txt
@@ -30,12 +36,18 @@ build() {
 	mkdir -p "$builddir"/build
 	cd "$builddir"/build
 
+	local cmakeoptions=
+	case "$CARCH" in
+		aarch64) cmakeoptions="-DPREFER_LUA=ON" ;;
+	esac
+
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_JEMALLOC=FALSE \
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE \
+		$cmakeoptions
 	make
 }
 
-- 
cgit v1.2.3