X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e388b4072595b73defd133ff2fee5f5886ea0f10..67dd2869dda649cf9eed24017b2b88131f29eb31:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 2d69d566..2cadfd27 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -6,6 +6,8 @@ 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,28 +21,8 @@ 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" $TERMUX_PKG_SRCDIR \
-		-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_step_pre_configure () {
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG"
 }
 
 termux_step_post_make_install () {