From f7001a8b0a02ee0a298f91724fdd45aaf9ce82f4 Mon Sep 17 00:00:00 2001 From: Vishal Biswas Date: Thu, 13 Apr 2017 17:28:16 +0530 Subject: [PATCH] update cmake (#928) * librhash: add package * cmake: update from 3.7.2 to 3.8.0 * build-package: update termux_setup_cmake to 3.8.0 * cmake: add librhash dependency --- build-package.sh | 6 +++--- packages/cmake/build.sh | 9 ++++----- packages/librhash/build.sh | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 packages/librhash/build.sh diff --git a/build-package.sh b/build-package.sh index 6d9468811..c70e25b9e 100755 --- a/build-package.sh +++ b/build-package.sh @@ -90,8 +90,8 @@ termux_setup_golang() { # Utility function for cmake-built packages to setup a current cmake. termux_setup_cmake() { - local TERMUX_CMAKE_MAJORVESION=3.7 - local TERMUX_CMAKE_MINORVERSION=2 + local TERMUX_CMAKE_MAJORVESION=3.8 + local TERMUX_CMAKE_MINORVERSION=0 local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME @@ -99,7 +99,7 @@ termux_setup_cmake() { if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ "$TERMUX_CMAKE_TARFILE" \ - 0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406 + 330357990d84599f9c1a87f568a724f0fe5de1687c32961dda689d52588a5b24 rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index 5c3ffed0f..afc81d31d 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -1,11 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" -_MAJOR_VERSION=3.7 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_REVISION=1 +_MAJOR_VERSION=3.8 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 -TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv" +TERMUX_PKG_SHA256=cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 +TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, librhash" TERMUX_PKG_FORCE_CMAKE=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON" diff --git a/packages/librhash/build.sh b/packages/librhash/build.sh new file mode 100644 index 000000000..3e88e2b0c --- /dev/null +++ b/packages/librhash/build.sh @@ -0,0 +1,22 @@ +TERMUX_PKG_HOMEPAGE=http://rhash.sourceforge.net/ +TERMUX_PKG_VERSION=1.3.4 +TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=1f6daa0c066c94d2575f0aace76f34e5800c51f59f4b30029ddcfa9799564f98 +TERMUX_PKG_FOLDERNAME=RHash-$TERMUX_PKG_VERSION +TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums" +TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" + +# we only build the library since we don't need the binary +termux_step_make () { + CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS" + make lib-shared -j $TERMUX_MAKE_PROCESSES \ + ADDCFLAGS="$CFLAGS" \ + ADDLDFLAGS="$LDFLAGS" +} + +termux_step_make_install () { + make -C librhash install-lib-shared install-headers PREFIX=$TERMUX_PREFIX + ln -sf $TERMUX_PREFIX/lib/librhash.so.0 $TERMUX_PREFIX/lib/librhash.so +}