diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2022-12-06 12:33:58 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-06 23:10:40 +0100 |
| commit | f72be4524d2c74a34eaea67edb45fbe745b48bba (patch) | |
| tree | dd3478fc9b1be0e446c9627196588e4f13186386 | |
| parent | 48025b8ac9c62ead241ea1daf1092993fb94aeac (diff) | |
| download | upstream-f72be4524d2c74a34eaea67edb45fbe745b48bba.tar.gz upstream-f72be4524d2c74a34eaea67edb45fbe745b48bba.tar.bz2 upstream-f72be4524d2c74a34eaea67edb45fbe745b48bba.zip | |
tools/cmake: update to 3.25.1
Update cmake to version 3.25.1
* refresh patches
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
| -rw-r--r-- | tools/cmake/Makefile | 4 | ||||
| -rw-r--r-- | tools/cmake/patches/120-curl-fix-libressl-linking.patch | 2 | ||||
| -rw-r--r-- | tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 2 | ||||
| -rw-r--r-- | tools/cmake/patches/150-zstd-libarchive.patch | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 07e2a43218..b7dadee733 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.24.2 +PKG_VERSION:=3.25.1 PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:kitware:cmake @@ -15,7 +15,7 @@ PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ https://cmake.org/files/v$(PKG_VERSION_MAJOR)/ -PKG_HASH:=0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db +PKG_HASH:=1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8 HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch b/tools/cmake/patches/120-curl-fix-libressl-linking.patch index 6ef37c22cb..1744fe5b04 100644 --- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch +++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -594,6 +594,14 @@ if(CURL_USE_OPENSSL) +@@ -611,6 +611,14 @@ if(CURL_USE_OPENSSL) endif() set(SSL_ENABLED ON) set(USE_OPENSSL ON) diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 2b3ba361bd..70d122c9d9 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -1441,7 +1441,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1449,7 +1449,10 @@ int main(){ printf("1%c", (char)0x0a); r ' > "test.c" cmake_original_make_flags="${cmake_make_flags}" if test "x${cmake_parallel_make}" != "x"; then diff --git a/tools/cmake/patches/150-zstd-libarchive.patch b/tools/cmake/patches/150-zstd-libarchive.patch index 603ac03775..34f7240fe4 100644 --- a/tools/cmake/patches/150-zstd-libarchive.patch +++ b/tools/cmake/patches/150-zstd-libarchive.patch @@ -1,6 +1,6 @@ --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -630,8 +630,13 @@ IF(ENABLE_ZSTD) +@@ -632,8 +632,13 @@ IF(ENABLE_ZSTD) SET(ZSTD_FIND_QUIETLY TRUE) ENDIF (ZSTD_INCLUDE_DIR) |