neovim: Update to latest master

[termux-packages] / packages / neovim / build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 48a2ec6..6443844 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,11 +1,13 @@
-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=9956beee248bef39385449e134879cb864a5a7eb
-TERMUX_PKG_VERSION=0.2.0.201611271920
+_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
@@ -19,33 +21,12 @@ termux_step_host_build () {
        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=Android \
-               -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
-               -DENABLE_JEMALLOC=OFF \
-               -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf \
-               -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit \
-               $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/
 }