cmake: bump to v3.31.5

tools/cmake/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.30.5
+PKG_VERSION:=3.31.5
 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:=9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d
+PKG_HASH:=66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
@@ -30,13 +30,8 @@ HOST_CONFIGURE_VARS += \
 	MAKE="$(STAGING_DIR_HOST)/bin/ninja"
 
 HOST_CONFIGURE_ARGS := \
-	--no-debugger \
 	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
 	--prefix="$(STAGING_DIR_HOST)" \
-	--system-expat \
-	--system-liblzma \
-	--system-zlib \
-	--system-zstd \
 	--generator=Ninja
 
 define Host/Compile/Default

tools/cmake/patches/100-no-testing.patch

@@ -11,15 +11,15 @@
  # like vs9 or vs10
 --- a/Modules/Dart.cmake
 +++ b/Modules/Dart.cmake
-@@ -47,7 +47,7 @@ if(cmp0145 STREQUAL "")
-   message(AUTHOR_WARNING "${_cmp0145_warning}")
- endif()
+@@ -33,7 +33,7 @@ whether testing support should be enable
+ #
+ #
  
 -option(BUILD_TESTING "Build the testing tree." ON)
 +option(BUILD_TESTING "Build the testing tree." OFF)
  
  if(BUILD_TESTING)
-   # We only get here if a project already ran include(Dart),
+   find_package(Dart QUIET)
 --- a/Tests/Contracts/VTK/Dashboard.cmake.in
 +++ b/Tests/Contracts/VTK/Dashboard.cmake.in
 @@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BIN

tools/cmake/patches/110-liblzma.patch

@@ -1,17 +0,0 @@
---- a/Modules/FindLibLZMA.cmake
-+++ b/Modules/FindLibLZMA.cmake
-@@ -61,7 +61,13 @@ The following variables are provided for
- cmake_policy(PUSH)
- cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
- 
--find_path(LIBLZMA_INCLUDE_DIR lzma.h )
-+if(UNIX)
-+  find_package(PkgConfig QUIET)
-+  pkg_search_module(PC_liblzma liblzma)
-+endif()
-+
-+find_path(LIBLZMA_INCLUDE_DIR lzma.h HINTS ${PC_liblzma_INCLUDEDIR} ${PC_liblzma_INCLUDE_DIRS})
-+find_library(LIBLZMA_LIBRARY NAMES lzma HINTS ${PC_liblzma_LIBDIR} ${PC_liblzma_LIBRARY_DIRS})
- if(NOT LIBLZMA_LIBRARY)
-   find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma NAMES_PER_DIR PATH_SUFFIXES lib)
-   find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad NAMES_PER_DIR PATH_SUFFIXES lib)

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

@@ -1,37 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Wed, 11 Jan 2017 03:36:04 +0100
-Subject: [PATCH] cmcurl: link librt
-
-When cmake is linked against LibreSSL, there might be an indirect
-dependency on librt on certain systems if LibreSSL's libcrypto uses
-clock_gettime() from librt:
-
-    [ 28%] Linking C executable LIBCURL
-    .../lib/libcrypto.a(getentropy_linux.o): In function `getentropy_fallback':
-    getentropy_linux.c:(.text+0x16d): undefined reference to `clock_gettime'
-    getentropy_linux.c:(.text+0x412): undefined reference to `clock_gettime'
-    collect2: error: ld returned 1 exit status
-    make[5]: *** [Utilities/cmcurl/LIBCURL] Error 1
-
-Modify the cmcurl CMakeLists.txt to check for clock_gettime() in librt
-and unconditionally link the rt library when the symbol is found.
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
----
---- a/Utilities/cmcurl/CMakeLists.txt
-+++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -648,6 +648,14 @@ if(CURL_USE_OPENSSL)
-   endif()
-   set(SSL_ENABLED ON)
-   set(USE_OPENSSL ON)
-+  check_library_exists("rt" clock_gettime "" HAVE_LIBRT)
-+  if(HAVE_LIBRT)
-+    list(APPEND OPENSSL_LIBRARIES rt)
-+  endif()
-+  check_library_exists("pthread" pthread_once "" HAVE_PTHREAD)
-+  if(HAVE_PTHREAD)
-+    list(APPEND OPENSSL_LIBRARIES pthread)
-+  endif()
-   list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
-   include_directories(${OPENSSL_INCLUDE_DIR})
- 

tools/cmake/patches/130-bootstrap_parallel_make_flag.patch

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

tools/cmake/patches/140-zlib.patch

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

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

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

tools/cmake/patches/160-disable_xcode_generator.patch

@@ -1,6 +1,6 @@
 --- a/Source/CMakeLists.txt
 +++ b/Source/CMakeLists.txt
-@@ -858,7 +858,7 @@ if(CMake_USE_XCOFF_PARSER)
+@@ -903,7 +903,7 @@ if(CMake_USE_XCOFF_PARSER)
  endif()
  
  # Xcode only works on Apple
@@ -11,8 +11,8 @@
      PRIVATE
 --- a/Source/cmake.cxx
 +++ b/Source/cmake.cxx
-@@ -134,7 +134,7 @@
- #  include "cmGlobalGhsMultiGenerator.h"
+@@ -143,7 +143,7 @@
+ #  endif
  #endif
  
 -#if defined(__APPLE__)