neovim: Use bundled lua

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index cd8b456a2235d4bb5242b0530d9dc30d6f05fbd0..f90ff2b54f914f953d450084cb96878c44044194 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,13 +1,18 @@
 TERMUX_PKG_HOMEPAGE=http://neovim.org/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
 TERMUX_PKG_HOMEPAGE=http://neovim.org/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"

-TERMUX_PKG_VERSION=0.1.5.`date "+%Y%m%d%H%M"`
-TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/master.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
+_COMMIT=bd9715a9b565be67869ea0d8c8eb162954ffb7bb
+TERMUX_PKG_VERSION=0.1.5.201605300949
+TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip

 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"

-TERMUX_PKG_FOLDERNAME="neovim-master"
+TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"

 TERMUX_PKG_HOSTBUILD=true
 
 termux_step_host_build () {
 TERMUX_PKG_HOSTBUILD=true
 
 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
        cd $TERMUX_PKG_SRCDIR
        make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
        make distclean


@@ -15,6 +20,8 @@ termux_step_host_build () {
 }
 
 termux_step_configure () {
 }
 
 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` \
        cd $TERMUX_PKG_BUILDDIR
        cmake -G "Unix Makefiles" .. \
                -DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \


@@ -30,9 +37,9 @@ termux_step_configure () {
                 -DCMAKE_MAKE_PROGRAM=`which make` \
                -DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
                -DCMAKE_SYSTEM_NAME=Linux \
                 -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 \
                 -DENABLE_JEMALLOC=OFF \
                 -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
                 -DENABLE_JEMALLOC=OFF \

+               -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit \

                $TERMUX_PKG_SRCDIR
 }
 
                $TERMUX_PKG_SRCDIR
 }
 

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 043d7b5248ec2eca54305db3c0f181c966180ab7..82a9e1f74b2e6a44098bd00128d085fb640abfbe 100755 (executable)
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -17,7 +17,6 @@ PACKAGES="$PACKAGES libglib2.0-dev"           # Provides 'glib-genmarshal' which the glib
 PACKAGES="$PACKAGES libncurses5-dev"
 PACKAGES="$PACKAGES libtool-bin"
 PACKAGES="$PACKAGES lzip"
 PACKAGES="$PACKAGES libncurses5-dev"
 PACKAGES="$PACKAGES libtool-bin"
 PACKAGES="$PACKAGES lzip"

-PACKAGES="$PACKAGES luarocks"                  # Used by the neovim build.

 PACKAGES="$PACKAGES subversion"                        # Used by the netpbm build.
 PACKAGES="$PACKAGES tar"
 PACKAGES="$PACKAGES unzip"
 PACKAGES="$PACKAGES subversion"                        # Used by the netpbm build.
 PACKAGES="$PACKAGES tar"
 PACKAGES="$PACKAGES unzip"


@@ -30,10 +29,5 @@ PACKAGES="$PACKAGES xmlto"
 PACKAGES="$PACKAGES xutils-dev"                        # Provides 'makedepend' which the openssl build uses.
 DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES
 
 PACKAGES="$PACKAGES xutils-dev"                        # Provides 'makedepend' which the openssl build uses.
 DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES
 

-# Needed by neovim build:
-sudo luarocks install lpeg
-sudo luarocks install mpack
-sudo luarocks install luabitop
-

 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R `whoami` /data
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R `whoami` /data