From: Fredrik Fornwall Date: Wed, 18 Jan 2017 03:06:03 +0000 (+0100) Subject: Call termux_setup_cmake before invoking cmake X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/320bee67d1f27bf221c6066be4ae8a4179b11ca1?ds=inline Call termux_setup_cmake before invoking cmake This fixes build in an environment (e.g. the Docker image) without cmake installed. --- diff --git a/packages/clang/build.sh b/packages/clang/build.sh index 43863092..4a622508 100644 --- a/packages/clang/build.sh +++ b/packages/clang/build.sh @@ -42,6 +42,7 @@ termux_step_post_extract_package () { } termux_step_host_build () { + termux_setup_cmake cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \ -DLLVM_BUILD_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index 6443844b..cd5620e4 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -10,6 +10,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_JEMALLOC=OFF -DGPERF_PRG=$TERMUX_PKG_H TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit" 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