Skip to content

Commit db68b8c

Browse files
zheshifandianrobimarko
authored andcommitted
tools/cmake: update to 4.3.1
Release notes:https://cmake.org/cmake/help/latest/release/4.3.html Refresh patches: - 130-bootstrap_parallel_make_flag.patch - 150-zstd-libarchive.patch - 160-disable_xcode_generator.patch Signed-off-by: Jack Sun <sunjiazheng321521@gmail.com> Link: openwrt/openwrt#22693 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 561e3cf commit db68b8c

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

tools/cmake/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=cmake
10-
PKG_VERSION:=4.2.3
10+
PKG_VERSION:=4.3.1
1111
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
1212
PKG_RELEASE:=1
1313
PKG_CPE_ID:=cpe:/a:kitware:cmake
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
1717
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
18-
PKG_HASH:=7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9
18+
PKG_HASH:=0798f4be7a1a406a419ac32db90c2956936fecbf50db3057d7af47d69a2d7edb
1919

2020
HOST_BUILD_PARALLEL:=1
2121
HOST_CONFIGURE_PARALLEL:=1

tools/cmake/patches/130-bootstrap_parallel_make_flag.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/bootstrap
22
+++ b/bootstrap
3-
@@ -1521,7 +1521,10 @@ int main(){ printf("1%c", (char)0x0a); r
3+
@@ -1522,7 +1522,10 @@ int main(){ printf("1%c", (char)0x0a); r
44
' > "test.c"
55
cmake_original_make_flags="${cmake_make_flags}"
66
if test "x${cmake_parallel_make}" != "x"; then

tools/cmake/patches/150-zstd-libarchive.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Utilities/cmlibarchive/CMakeLists.txt
22
+++ b/Utilities/cmlibarchive/CMakeLists.txt
3-
@@ -669,7 +669,7 @@ IF(ENABLE_ZSTD)
3+
@@ -680,7 +680,7 @@ IF(ENABLE_ZSTD)
44
SET(ZSTD_FIND_QUIETLY TRUE)
55
ENDIF (ZSTD_INCLUDE_DIR)
66

tools/cmake/patches/160-disable_xcode_generator.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Source/CMakeLists.txt
22
+++ b/Source/CMakeLists.txt
3-
@@ -903,7 +903,7 @@ if(CMake_USE_XCOFF_PARSER)
3+
@@ -923,7 +923,7 @@ if(CMake_USE_XCOFF_PARSER)
44
endif()
55

66
# Xcode only works on Apple
@@ -11,7 +11,7 @@
1111
PRIVATE
1212
--- a/Source/cmake.cxx
1313
+++ b/Source/cmake.cxx
14-
@@ -142,7 +142,7 @@
14+
@@ -144,7 +144,7 @@
1515
# endif
1616
#endif
1717

0 commit comments

Comments
 (0)