From: Linhui Liu <liulinhui36@gmail.com>
Date: Fri, 17 Mar 2023 03:57:55 +0000 (+0800)
Subject: tools/cmake: bump to 3.26.0
X-Git-Tag: v23.05.0-rc1~728
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=49294ffa90a311fd7defcdc6af3424bc69c617d9;p=openwrt%2Fstaging%2Fhauke.git

tools/cmake: bump to 3.26.0

Release Notes:
https://cmake.org/cmake/help/v3.26/release/3.26.html

Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
---

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index 3a81b9a29f..e4d9862c9b 100644
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.25.2
+PKG_VERSION:=3.26.0
 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:=c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c
+PKG_HASH:=4256613188857e95700621f7cdaaeb954f3546a9249e942bc2f9b3c26e381365
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
diff --git a/tools/cmake/patches/110-liblzma.patch b/tools/cmake/patches/110-liblzma.patch
index e98dd5ade7..d7cbd434a1 100644
--- a/tools/cmake/patches/110-liblzma.patch
+++ b/tools/cmake/patches/110-liblzma.patch
@@ -1,7 +1,7 @@
 --- a/Modules/FindLibLZMA.cmake
 +++ b/Modules/FindLibLZMA.cmake
-@@ -43,7 +43,13 @@ This module will set the following varia
-   version number as a string (ex: "5.0.3")
+@@ -58,7 +58,13 @@ The following variables are provided for
+ 
  #]=======================================================================]
  
 -find_path(LIBLZMA_INCLUDE_DIR lzma.h )
diff --git a/tools/cmake/patches/140-zlib.patch b/tools/cmake/patches/140-zlib.patch
index f79801c8a5..8b7b7de1b0 100644
--- a/tools/cmake/patches/140-zlib.patch
+++ b/tools/cmake/patches/140-zlib.patch
@@ -1,6 +1,6 @@
 --- a/Modules/FindZLIB.cmake
 +++ b/Modules/FindZLIB.cmake
-@@ -85,10 +85,13 @@ else()
+@@ -117,10 +117,13 @@ else()
    set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
  endif()