hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-06 20:54:00 -05:00
Code Issues Projects Releases Wiki Activity

tools/cmake: update to 4.2.0

Browse Source 
Update cmake to version 4.2.0
Release notes at https://cmake.org/cmake/help/v4.2/release/4.2.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Link: https://github.com/openwrt/openwrt/pull/20863
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Hannu Nyman 2025-11-22 09:29:46 +02:00 committed by Christian Marangi
parent 117546b49a
commit 9ba24e0ee9
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/cmake/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=4.1.2 PKG_VERSION:=4.2.0
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_CPE_ID:=cpe:/a:kitware:cmake 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:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/ https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
PKG_HASH:=643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15 PKG_HASH:=4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

2
tools/cmake/patches/110-liblzma.patch
View File

@ -1,6 +1,6 @@
--- a/Modules/FindLibLZMA.cmake --- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake +++ b/Modules/FindLibLZMA.cmake
@@ -82,7 +82,13 @@ Finding the liblzma library and linking @@ -114,7 +114,13 @@ Finding the liblzma library and linking
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n> cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>

2
tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
View File

@ -1,6 +1,6 @@
--- a/bootstrap --- a/bootstrap
+++ b/bootstrap +++ b/bootstrap
@@ -1520,7 +1520,10 @@ int main(){ printf("1%c", (char)0x0a); r @@ -1521,7 +1521,10 @@ int main(){ printf("1%c", (char)0x0a); r
' > "test.c" ' > "test.c"
cmake_original_make_flags="${cmake_make_flags}" cmake_original_make_flags="${cmake_make_flags}"
if test "x${cmake_parallel_make}" != "x"; then if test "x${cmake_parallel_make}" != "x"; then

2
tools/cmake/patches/140-zlib.patch
View File

@ -1,6 +1,6 @@
--- a/Modules/FindZLIB.cmake --- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake
@@ -147,10 +147,13 @@ else() @@ -160,10 +160,13 @@ else()
set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd) set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
endif() endif()

2
tools/cmake/patches/150-zstd-libarchive.patch
View File

@ -1,6 +1,6 @@
--- a/Utilities/cmlibarchive/CMakeLists.txt --- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -655,7 +655,7 @@ IF(ENABLE_ZSTD) @@ -669,7 +669,7 @@ IF(ENABLE_ZSTD)
SET(ZSTD_FIND_QUIETLY TRUE) SET(ZSTD_FIND_QUIETLY TRUE)
ENDIF (ZSTD_INCLUDE_DIR) ENDIF (ZSTD_INCLUDE_DIR)

4
tools/cmake/patches/160-disable_xcode_generator.patch
View File

@ -1,6 +1,6 @@
--- a/Source/CMakeLists.txt --- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt
@@ -886,7 +886,7 @@ if(CMake_USE_XCOFF_PARSER) @@ -903,7 +903,7 @@ if(CMake_USE_XCOFF_PARSER)
endif() endif()
# Xcode only works on Apple # Xcode only works on Apple
@ -11,7 +11,7 @@
PRIVATE PRIVATE
--- a/Source/cmake.cxx --- a/Source/cmake.cxx
+++ b/Source/cmake.cxx +++ b/Source/cmake.cxx
@@ -138,7 +138,7 @@ @@ -143,7 +143,7 @@
# endif # endif
#endif #endif