Ver código fonte

tools/cmake: update to 3.22.0

Refreshed patches.

Signed-off-by: Rosen Penev <[email protected]>
Rosen Penev 3 anos atrás
pai
commit
a18047de45

+ 2 - 2
tools/cmake/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.21.3
+PKG_VERSION:=3.22.0
 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/v3.19/
-PKG_HASH:=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
+PKG_HASH:=998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1

+ 1 - 1
tools/cmake/patches/120-curl-fix-libressl-linking.patch

@@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <[email protected]>
 ---
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -528,6 +528,14 @@ if(CMAKE_USE_OPENSSL)
+@@ -565,6 +565,14 @@ if(CMAKE_USE_OPENSSL)
    endif()
    set(SSL_ENABLED ON)
    set(USE_OPENSSL ON)

+ 1 - 1
tools/cmake/patches/130-bootstrap_parallel_make_flag.patch

@@ -1,6 +1,6 @@
 --- a/bootstrap
 +++ b/bootstrap
-@@ -1420,7 +1420,10 @@ int main(){ printf("1%c", (char)0x0a); r
+@@ -1423,7 +1423,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