Skip to contentSkip to conversation

cmake: Update to 3.31.7

PATCH In review Peter Kjellerstedt 3 participants 3 messages Jun 9, 2025 – Jun 11, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake: Update to 3.31.7

Changes since 3.31.6:
* 5c7224b: Tests: Teach RunCMake to ignore GNU ld --warn-rwx-segments warnings
* e9c4940: cmake-gui: Fix regression that prints an incidental error on fresh build trees
* 1b0c92a: cmCurl: Avoid using undocumented type for CURLOPT_NETRC values
* 1b4a802: MSVC: Split C++23 flag selection into dedicated block
* b3f1c60: MSVC: Use -std:c++23preview flag for C++23 when available
* 90d9c79: file(MAKE_DIRECTORY): Do not make directories for command keywords
* a039a16: file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
* d54916d: MSVC: Revert use of temporary -std:c++23preview flag for

           C++23

* bbbbab4: Help: Add 3.31 release note for CMAKE_CONFIG_DIR
* 9b5915c: MARMASM: Fix loading linker information
* 3f5f2b2: Linker: Honor CMAKE_<LANG>_LINK_LIBRARY_USING_FEATURE_SUPPORTED when FALSE
* a9b126b: Linker: Save linker inspection results with compiler inspection results
* 7b552b9: Linker: Save GNU push-/pop-state detection with compiler inspection results
* d5be7c7: Linker: Detect GNU push-state/pop-state flags more robustly
* cbb8f30: CUDAToolkit: Restore ability to find cupti library
* aa64d44: macOS: Define _DARWIN_C_SOURCE in more sources
* 14ffd1c: cmXCodeObject: Drop unused CoreFoundation header
* 42390e7: Source: Include specific CoreFoundation headers instead of umbrella header
* 7b16db9: CMake 3.31.7

---
 ...ative_3.31.6.bb => cmake-native_3.31.7.bb} |  0
 meta/recipes-devtools/cmake/cmake.inc         |  3 +-
 ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 -------------------
 .../{cmake_3.31.6.bb => cmake_3.31.7.bb}      |  0
 4 files changed, 1 insertion(+), 32 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => cmake-native_3.31.7.bb} (100%)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch
 rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_3.31.7.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.31.7.bb
meta/recipes-devtools/cmake/cmake.inc +1 -2
index 9b1898f22f..ee17482e3f 100644
@@ -18,10 +18,9 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \
-           file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \
            "
 
-SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0"
+SRC_URI[sha256sum] = "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch deleted +0 -30
deleted file mode 100644
index c719c1fdfb..0000000000
@@ -1,30 +0,0 @@
-From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <[email protected]>
-Date: Wed, 9 Apr 2025 01:40:46 +0000
-Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
- values
-
-Fix: nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive]
-Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd]
-
-Signed-off-by: Wang Mingyu <[email protected]>
----
- Source/cmCurl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
-index b9133ed7..0cf8a71a 100644
---- a/Source/cmCurl.cxx
-+++ b/Source/cmCurl.cxx
-@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
-                                  const std::string& netrc_file)
- {
-   std::string e;
--  CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
-+  long curl_netrc_level = CURL_NETRC_LAST;
-   ::CURLcode res;
- 
-   if (!netrc_level.empty()) {
--- 
-2.43.0
-
meta/recipes-devtools/cmake/cmake_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake_3.31.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake_3.31.7.bb
#1 lore raw

Isn't 4.x the latest version? If there are reason to choose something else for master, they should be placed into commit message.

Alex

Quoted 112 lines · Peter Kjellerstedt via lists.openembedded.org

Changes since 3.31.6:
* 5c7224b: Tests: Teach RunCMake to ignore GNU ld --warn-rwx-segments warnings
* e9c4940: cmake-gui: Fix regression that prints an incidental error on fresh build trees
* 1b0c92a: cmCurl: Avoid using undocumented type for CURLOPT_NETRC values
* 1b4a802: MSVC: Split C++23 flag selection into dedicated block
* b3f1c60: MSVC: Use -std:c++23preview flag for C++23 when available
* 90d9c79: file(MAKE_DIRECTORY): Do not make directories for command keywords
* a039a16: file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
* d54916d: MSVC: Revert use of temporary -std:c++23preview flag for

           C++23

* bbbbab4: Help: Add 3.31 release note for CMAKE_CONFIG_DIR
* 9b5915c: MARMASM: Fix loading linker information
* 3f5f2b2: Linker: Honor CMAKE_<LANG>_LINK_LIBRARY_USING_FEATURE_SUPPORTED when FALSE
* a9b126b: Linker: Save linker inspection results with compiler inspection results
* 7b552b9: Linker: Save GNU push-/pop-state detection with compiler inspection results
* d5be7c7: Linker: Detect GNU push-state/pop-state flags more robustly
* cbb8f30: CUDAToolkit: Restore ability to find cupti library
* aa64d44: macOS: Define _DARWIN_C_SOURCE in more sources
* 14ffd1c: cmXCodeObject: Drop unused CoreFoundation header
* 42390e7: Source: Include specific CoreFoundation headers instead of umbrella header
* 7b16db9: CMake 3.31.7

---
 ...ative_3.31.6.bb => cmake-native_3.31.7.bb} |  0
 meta/recipes-devtools/cmake/cmake.inc         |  3 +-
 ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 -------------------
 .../{cmake_3.31.6.bb => cmake_3.31.7.bb}      |  0
 4 files changed, 1 insertion(+), 32 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => cmake-native_3.31.7.bb} (100%)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch
 rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_3.31.7.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.31.7.bb
meta/recipes-devtools/cmake/cmake.inc +1 -2
index 9b1898f22f..ee17482e3f 100644
@@ -18,10 +18,9 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \
-           file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \
            "
 
-SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0"
+SRC_URI[sha256sum] = "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch deleted +0 -30
deleted file mode 100644
index c719c1fdfb..0000000000
@@ -1,30 +0,0 @@
-From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <[email protected]>
-Date: Wed, 9 Apr 2025 01:40:46 +0000
-Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
- values
-
-Fix: nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive]
-Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd]
-
-Signed-off-by: Wang Mingyu <[email protected]>
----
- Source/cmCurl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
-index b9133ed7..0cf8a71a 100644
---- a/Source/cmCurl.cxx
-+++ b/Source/cmCurl.cxx
-@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
-                                  const std::string& netrc_file)
- {
-   std::string e;
--  CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
-+  long curl_netrc_level = CURL_NETRC_LAST;
-   ::CURLcode res;
-
-   if (!netrc_level.empty()) {
---
-2.43.0
-
meta/recipes-devtools/cmake/cmake_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake_3.31.6.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake_3.31.7.bb
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#218307): https://lists.openembedded.org/g/openembedded-core/message/218307
Mute This Topic: https://lists.openembedded.org/mt/113558809/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
Quoted 9 lines

-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: den 10 juni 2025 11:02
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] cmake: Update to 3.31.7

Isn't 4.x the latest version? If there are reason to choose something else for master, they should be placed into commit message.

That is for someone who knows cmake to answer. The changes in 3.31.7 were simple enough that I could sign off on them. My goal with this update is for it to eventually be accepted as a backport for Walnascar, but I cannot do that until master uses it (or a later version), and updating to 4.0.2 is not something I felt comfortable doing.

Quoted 107 lines

Alex

Quoted 103 lines · Peter Kjellerstedt via lists.openembedded.org

Changes since 3.31.6:
* 5c7224b: Tests: Teach RunCMake to ignore GNU ld --warn-rwx-segments warnings
* e9c4940: cmake-gui: Fix regression that prints an incidental error on fresh build trees
* 1b0c92a: cmCurl: Avoid using undocumented type for CURLOPT_NETRC values
* 1b4a802: MSVC: Split C++23 flag selection into dedicated block
* b3f1c60: MSVC: Use -std:c++23preview flag for C++23 when available
* 90d9c79: file(MAKE_DIRECTORY): Do not make directories for command keywords
* a039a16: file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
* d54916d: MSVC: Revert use of temporary -std:c++23preview flag for

           C++23

* bbbbab4: Help: Add 3.31 release note for CMAKE_CONFIG_DIR
* 9b5915c: MARMASM: Fix loading linker information
* 3f5f2b2: Linker: Honor CMAKE_<LANG>_LINK_LIBRARY_USING_FEATURE_SUPPORTED when FALSE
* a9b126b: Linker: Save linker inspection results with compiler inspection results
* 7b552b9: Linker: Save GNU push-/pop-state detection with compiler inspection results
* d5be7c7: Linker: Detect GNU push-state/pop-state flags more robustly
* cbb8f30: CUDAToolkit: Restore ability to find cupti library
* aa64d44: macOS: Define _DARWIN_C_SOURCE in more sources
* 14ffd1c: cmXCodeObject: Drop unused CoreFoundation header
* 42390e7: Source: Include specific CoreFoundation headers instead of umbrella header
* 7b16db9: CMake 3.31.7

---
 ...ative_3.31.6.bb => cmake-native_3.31.7.bb} |  0
 meta/recipes-devtools/cmake/cmake.inc         |  3 +-
 ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 -------------------
 .../{cmake_3.31.6.bb => cmake_3.31.7.bb}      |  0
 4 files changed, 1 insertion(+), 32 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => cmake-native_3.31.7.bb} (100%)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch
 rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_3.31.7.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.31.7.bb
meta/recipes-devtools/cmake/cmake.inc +1 -2
index 9b1898f22f..ee17482e3f 100644
@@ -18,10 +18,9 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \
-           file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \
            "
 
-SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0"
+SRC_URI[sha256sum] = "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch deleted +0 -30
deleted file mode 100644
index c719c1fdfb..0000000000
@@ -1,30 +0,0 @@
-From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <[email protected]>
-Date: Wed, 9 Apr 2025 01:40:46 +0000
-Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
- values
-
-Fix: nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive]
-Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd]
-
-Signed-off-by: Wang Mingyu <[email protected]>
----
- Source/cmCurl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
-index b9133ed7..0cf8a71a 100644
---- a/Source/cmCurl.cxx
-+++ b/Source/cmCurl.cxx
-@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
-                                  const std::string& netrc_file)
- {
-   std::string e;
--  CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
-+  long curl_netrc_level = CURL_NETRC_LAST;
-   ::CURLcode res;
-
-   if (!netrc_level.empty()) {
---
-2.43.0
-
meta/recipes-devtools/cmake/cmake_3.31.7.bb renamed from meta/recipes-devtools/cmake/cmake_3.31.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.31.6.bb
rename to meta/recipes-devtools/cmake/cmake_3.31.7.bb