X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/49168cdc8f61ed7373237f92d0e7a1ec33af3abc..a19f43f2afc220a4e2a9b5443379e2af459b1ed8:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 3fd09d30..6443844b 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,44 +1,32 @@
-TERMUX_PKG_HOMEPAGE=http://neovim.org/
+TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-TERMUX_PKG_VERSION=0.0.`date "+%Y%m%d%H%M"`
-TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/master.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libluajit, libvterm, libtermkey, libutil"
-TERMUX_PKG_FOLDERNAME="neovim-master"
+_COMMIT=a062cd4ce58ba9aca6fdce443b014c9c0949ecde
+TERMUX_PKG_VERSION=0.2.0.201701162318
+TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
+TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_JEMALLOC=OFF -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit"
 
 termux_step_host_build () {
+	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
+	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
+	cmake $TERMUX_PKG_SRCDIR/third-party
+	make
+
 	cd $TERMUX_PKG_SRCDIR
 	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
 	make distclean
 	rm -Rf build/
 }
 
-termux_step_configure () {
-	# Install dependencies on ubuntu:
-	# apt install lua-lpeg luarocks; luarocks install lpeg; luarocks install lua-MessagePack; luarocks install luabitop
-	cd $TERMUX_PKG_BUILDDIR
-	cmake -G "Unix Makefiles" .. \
-		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
-                -DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_CROSSCOMPILING=True \
-		-DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX \
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-		-DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
-		-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
-                -DCMAKE_MAKE_PROGRAM=`which make` \
-		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
-		-DCMAKE_SYSTEM_NAME=Linux \
-                -DLUA_PRG=`which lua` \
-                -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
-		$TERMUX_PKG_SRCDIR
+termux_step_pre_configure () {
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG"
 }
 
 termux_step_post_make_install () {
-	local _CONFIG_DIR=$TERMUX_PREFIX/etc/xdg/nvim
+	local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim
 	mkdir -p $_CONFIG_DIR
-	cp $TERMUX_PKG_BUILDER_DIR/init.vim $_CONFIG_DIR/
+	cp $TERMUX_PKG_BUILDER_DIR/sysinit.vim $_CONFIG_DIR/
 }