neovim: Use a host-built nvim when needed

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index c6e1d538af871012269908abdd4effd9da034423..6c9c22aabfd36f202854f6c4d41227af91bcca78 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -5,6 +5,14 @@ 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"
 TERMUX_PKG_FOLDERNAME="neovim-master"
 TERMUX_PKG_NO_SRC_CACHE=yes
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libluajit, libvterm, libtermkey"
 TERMUX_PKG_FOLDERNAME="neovim-master"

+TERMUX_PKG_HOSTBUILD=true
+
+termux_step_host_build () {
+       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:
 
 termux_step_configure () {
        # Install dependencies on ubuntu:

diff --git a/packages/neovim/cmake-GenerateHelptags.cmake.patch b/packages/neovim/cmake-GenerateHelptags.cmake.patch
index fa6c03029cf0ef83c23bdbaf8fb21249f44de619..6bc6717ce0915f11a09dadbd6646bdf92c6620a5 100644 (file)
--- a/packages/neovim/cmake-GenerateHelptags.cmake.patch
+++ b/packages/neovim/cmake-GenerateHelptags.cmake.patch
@@ -6,7 +6,7 @@ diff -u -r ../neovim-master/cmake/GenerateHelptags.cmake.in ./cmake/GenerateHelp
  file(WRITE ${EMPTY_FILE} "")
  execute_process(
 -  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim
  file(WRITE ${EMPTY_FILE} "")
  execute_process(
 -  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim

-+  COMMAND "vim"
++  COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim"

      -u NONE
      -esX
      -c "helptags ++t ."
      -u NONE
      -esX
      -c "helptags ++t ."

diff --git a/packages/neovim/runtime-CMakeLists.txt.patch b/packages/neovim/runtime-CMakeLists.txt.patch
index 0f5f278d2b349fecd2f1375efb6439f40d293ca8..ba45d1310c9d1dd2b48e355dd7cbbbba4f143f8c 100644 (file)
--- a/packages/neovim/runtime-CMakeLists.txt.patch
+++ b/packages/neovim/runtime-CMakeLists.txt.patch
@@ -6,7 +6,7 @@ diff -u -r ../neovim-master/runtime/CMakeLists.txt ./runtime/CMakeLists.txt
    COMMAND ${CMAKE_COMMAND} -E copy_directory
      ${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
 -  COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
    COMMAND ${CMAKE_COMMAND} -E copy_directory
      ${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
 -  COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"

-+  COMMAND vim
++  COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim"

      -u NONE
      -i NONE
      -esX
      -u NONE
      -i NONE
      -esX