From 9f28b53c09ff7b085e68b937781421423f3bda42 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 14 Feb 2022 16:22:52 +0530 Subject: [PATCH] cmake: update to 3.23.0 --- packages/cmake/build.sh | 21 +++++++++++++++++---- scripts/build/setup/termux_setup_cmake.sh | 6 +++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index 258f7e934..9a4e0ae63 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -3,9 +3,22 @@ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package soft TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" # When updating version here, please update termux_setup_cmake.sh as well. -TERMUX_PKG_VERSION=3.22.3 +TERMUX_PKG_VERSION=3.23.0 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 -TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" +TERMUX_PKG_SHA256=5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82 +TERMUX_PKG_DEPENDS="clang, libarchive, libc++, libcurl, libexpat, jsoncpp, liblzma, libnghttp2, libuv, make, rhash, zlib, zstd" TERMUX_PKG_FORCE_CMAKE=true -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_USE_SYSTEM_BZIP2=ON +-DCMAKE_USE_SYSTEM_CURL=ON +-DCMAKE_USE_SYSTEM_EXPAT=ON +-DCMAKE_USE_SYSTEM_FORM=ON +-DCMAKE_USE_SYSTEM_JSONCPP=ON +-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON +-DCMAKE_USE_SYSTEM_LIBLZMA=ON +-DCMAKE_USE_SYSTEM_LIBRHASH=ON +-DCMAKE_USE_SYSTEM_LIBUV=ON +-DCMAKE_USE_SYSTEM_NGHTTP2=ON +-DCMAKE_USE_SYSTEM_ZLIB=ON +-DCMAKE_USE_SYSTEM_ZSTD=ON +-DBUILD_CursesDialog=ON" diff --git a/scripts/build/setup/termux_setup_cmake.sh b/scripts/build/setup/termux_setup_cmake.sh index c9588fe89..57d10c91d 100644 --- a/scripts/build/setup/termux_setup_cmake.sh +++ b/scripts/build/setup/termux_setup_cmake.sh @@ -1,6 +1,6 @@ termux_setup_cmake() { - local TERMUX_CMAKE_MAJORVESION=3.22 - local TERMUX_CMAKE_MINORVERSION=3 + local TERMUX_CMAKE_MAJORVESION=3.23 + 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 @@ -16,7 +16,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" \ - 96ace92dfe42b1c6c9c116fdb1c7adc42cb90cbaa87adcebc1a8de7ea129865c + 83f58ab96af19282cf19deaab942fe7990646ff798e6059d217a1a805d1ecf1b 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" \