Skip to content

Commit

Permalink
tools/cmake: update to 3.29.0
Browse files Browse the repository at this point in the history
Changelog:
- https://www.kitware.com/cmake-3-29-0-available-for-download/

Refresh patches:
- 120-curl-fix-libressl-linking.patch
- 130-bootstrap_parallel_make_flag.patch
- 150-zstd-libarchive.patch

Signed-off-by: Nick Hainke <[email protected]>
  • Loading branch information
PolynomialDivision committed Mar 29, 2024
1 parent 714c91d commit b05aad5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tools/cmake/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=cmake
PKG_VERSION:=3.28.3
PKG_VERSION:=3.29.0
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
PKG_RELEASE:=1
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:=72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1
PKG_HASH:=a0669630aae7baa4a8228048bf30b622f9e9fd8ee8cedb941754e9e38686c778

HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/patches/120-curl-fix-libressl-linking.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <[email protected]>
---
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -650,6 +650,14 @@ if(CURL_USE_OPENSSL)
@@ -647,6 +647,14 @@ if(CURL_USE_OPENSSL)
endif()
set(SSL_ENABLED ON)
set(USE_OPENSSL ON)
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/bootstrap
+++ b/bootstrap
@@ -1491,7 +1491,10 @@ int main(){ printf("1%c", (char)0x0a); r
@@ -1493,7 +1493,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
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/patches/150-zstd-libarchive.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -636,7 +636,7 @@ IF(ENABLE_ZSTD)
@@ -656,7 +656,7 @@ IF(ENABLE_ZSTD)
SET(ZSTD_FIND_QUIETLY TRUE)
ENDIF (ZSTD_INCLUDE_DIR)

Expand Down

0 comments on commit b05aad5

Please sign in to comment.