X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1b11c6fa66441b6b254bf96ac97e868019c1a8b6..f9fc47c910efe5e213928dfb67b4fea07b50f36e:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 9830452f..79396e10 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,50 +1,40 @@
-TERMUX_PKG_HOMEPAGE=http://neovim.org/
+TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-_COMMIT=999590b313ef32ca29c4ddba20c5b719730ee7ff
-TERMUX_PKG_VERSION=0.1.5.201606051426
+local _COMMIT=dc536295875640ef5d7b28d8135d0ef72d782d5e
+TERMUX_PKG_VERSION=0.2.3~2018.02.08
+TERMUX_PKG_SHA256=23ee040ac9bb8c67c839b21a993d88e79f7ac5c2fc3612498523c6f2d255f261
 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_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua, libunibilium"
 TERMUX_PKG_HOSTBUILD=true
+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 () {
+	termux_setup_cmake
+
 	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/
 }
 
-termux_step_configure () {
-	touch $TERMUX_PKG_HOSTBUILD_DIR/deps/CMakeCache.txt
-
-	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 \
-                -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
-                -DENABLE_JEMALLOC=OFF \
-		-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit \
-		$TERMUX_PKG_SRCDIR
-}
-
 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/
 }