ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tools/cmake: update to 3.31.2

Browse Source 
Release notes: https://cmake.org/cmake/help/latest/release/3.31.html

Refresh patches:
- 120-curl-fix-libressl-linking.patch
- 130-bootstrap_parallel_make_flag.patch
- 150-zstd-libarchive.patch
- 160-disable_xcode_generator.patch

Signed-off-by: Jack Sun <sunjiazheng321521@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17056
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Jack Sun 2024-12-09 16:43:49 +08:00 committed by Hauke Mehrtens
parent ff5f77ecdd
commit 4234d5ec45
5 changed files with 10 additions and 9 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:=3.30.5 PKG_VERSION:=3.31.2
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:=9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d PKG_HASH:=42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

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

@ -20,10 +20,11 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- ---
--- a/Utilities/cmcurl/CMakeLists.txt --- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt
@@ -648,6 +648,14 @@ if(CURL_USE_OPENSSL) @@ -775,7 +775,14 @@ if(CURL_USE_OPENSSL)
endif() endif()
set(SSL_ENABLED ON) set(_ssl_enabled ON)
set(USE_OPENSSL ON) set(USE_OPENSSL ON)
-
+ check_library_exists("rt" clock_gettime "" HAVE_LIBRT) + check_library_exists("rt" clock_gettime "" HAVE_LIBRT)
+ if(HAVE_LIBRT) + if(HAVE_LIBRT)
+ list(APPEND OPENSSL_LIBRARIES rt) + list(APPEND OPENSSL_LIBRARIES rt)
@ -34,4 +35,4 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ endif() + endif()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "openssl")

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

@ -1,6 +1,6 @@
--- a/bootstrap --- a/bootstrap
+++ b/bootstrap +++ b/bootstrap
@@ -1509,7 +1509,10 @@ int main(){ printf("1%c", (char)0x0a); r @@ -1514,7 +1514,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/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
@@ -656,7 +656,7 @@ IF(ENABLE_ZSTD) @@ -680,7 +680,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
@@ -858,7 +858,7 @@ if(CMake_USE_XCOFF_PARSER) @@ -888,7 +888,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
@@ -134,7 +134,7 @@ @@ -133,7 +133,7 @@
# include "cmGlobalGhsMultiGenerator.h" # include "cmGlobalGhsMultiGenerator.h"
#endif #endif