Add support for cmake 3.7 (#660)

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

diff --git a/packages/libssh/build.sh b/packages/libssh/build.sh
index 6bd8748..38f6cc7 100644 (file)
--- a/packages/libssh/build.sh
+++ b/packages/libssh/build.sh
@@ -4,24 +4,7 @@ TERMUX_PKG_VERSION=0.7.3
 TERMUX_PKG_SRCURL=https://red.libssh.org/attachments/download/195/libssh-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98
 TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DZLIB_INCLUDE_DIR=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DZLIB_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libz.so"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DTHREADS_PTHREAD_ARG=OFF"
 
-termux_step_configure () {
-       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 \
-               -DZLIB_INCLUDE_DIR=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include \
-               -DZLIB_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libz.so \
-               -DTHREADS_PTHREAD_ARG=OFF
-}