X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/29f304dd21fd5b6c820ba9276d104e0cf4079ffc..f252068260cd4a0d8abcaf8fa3b0f9328854d707:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 7c94a37f..88693d66 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,14 +1,23 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-_COMMIT=a667972568f7de0eb06c1cc9ee3dd3ff8dd6f5c9
-TERMUX_PKG_VERSION=0.2.0.201702200040
+local _COMMIT=2753d61e4cb037323d78ed3fd978a10694c902c6
+TERMUX_PKG_VERSION=0.2.1~20170806
+TERMUX_PKG_SHA256=82a03ab7e608b4396f592a124219df7472692da612862069f398df73c3792fdc
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
-TERMUX_PKG_SHA256=28035a2b7bfb36b1560decee3dab65fd5ba2199c9a87b84afe6db51918b2fa11
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"
 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_PKG_EXTRA_CONFIGURE_ARGS="
+-DENABLE_JEMALLOC=OFF
+-DGETTEXT_MSGFMT_EXECUTABLE=`which msgfmt`
+-DGETTEXT_MSGMERGE_EXECUTABLE=`which msgmerge`
+-DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf
+-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
+-DPKG_CONFIG_EXECUTABLE=`which pkg-config`
+-DXGETTEXT_PRG=`which xgettext`
+-DPREFER_LUA=ON
+-DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include
+"
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
 termux_step_host_build () {
@@ -17,10 +26,10 @@ termux_step_host_build () {
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cmake $TERMUX_PKG_SRCDIR/third-party
-	make
+	make -j 1
 
 	cd $TERMUX_PKG_SRCDIR
-	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
+	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$TERMUX_PKG_HOSTBUILD_DIR -DUSE_BUNDLED_LUAROCKS=ON" install
 	make distclean
 	rm -Rf build/
 }