summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Haase <Moritz.Haase@bmw.de>2025-10-14 10:46:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-16 10:53:10 +0100
commit5c8f6f30ffcfab2200e2e1f4c18d6afa0b3e88e5 (patch)
treeb0d3e5fe1208fcd93a0f38570b02e47da22c6102
parent51f694db182cc21d020462f51e80e1cbb96b73b6 (diff)
downloadpoky-5c8f6f30ffcfab2200e2e1f4c18d6afa0b3e88e5.tar.gz
cmake: upgrade 4.1.1 -> 4.1.2
Release notes are available at [0]. [0]: https://cmake.org/cmake/help/v4.1/release/4.1.html#id2 (From OE-Core rev: 53be4345591dd874cdf339081dffc4095fdb41da) Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_4.1.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_4.1.1.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch35
-rw-r--r--meta/recipes-devtools/cmake/cmake_4.1.2.bb (renamed from meta/recipes-devtools/cmake/cmake_4.1.1.bb)0
4 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_4.1.1.bb b/meta/recipes-devtools/cmake/cmake-native_4.1.2.bb
index 7b90bff52f..7b90bff52f 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.1.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.1.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index e86bb3dec1..256275d42b 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -17,10 +17,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \
17CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" 17CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
18 18
19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20 file://0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch \
21 " 20 "
22 21
23SRC_URI[sha256sum] = "b29f6f19733aa224b7763507a108a427ed48c688e1faf22b29c44e1c30549282" 22SRC_URI[sha256sum] = "643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15"
24 23
25UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
26 25
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch b/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
deleted file mode 100644
index d04d0be795..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001
2From: Brad King <brad.king@kitware.com>
3Date: Tue, 2 Sep 2025 11:41:10 -0400
4Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
5 CURLOPT_PROXYTYPE values
6
7Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
8enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
9are integer literals instead of `enum curl_proxytype`. It turns out
10that `curl_easy_setopt` has always expected a `long` anyway, and that
11`curl_proxytype` is not documented for public use.
12
13Fixes: #27178
14Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
15Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/commit/c8143074cf3954b1e169904eb9d843cfbe14acc3]
16---
17 Source/CTest/cmCTestCurl.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
21index 7836f4b9c7..9113890b5a 100644
22--- a/Source/CTest/cmCTestCurl.h
23+++ b/Source/CTest/cmCTestCurl.h
24@@ -52,7 +52,7 @@ private:
25 std::vector<std::string> HttpHeaders;
26 std::string HTTPProxyAuth;
27 std::string HTTPProxy;
28- curl_proxytype HTTPProxyType;
29+ long HTTPProxyType;
30 bool UseHttp10 = false;
31 bool Quiet = false;
32 int TimeOutSeconds = 0;
33--
342.43.0
35
diff --git a/meta/recipes-devtools/cmake/cmake_4.1.1.bb b/meta/recipes-devtools/cmake/cmake_4.1.2.bb
index cfc5cb1b93..cfc5cb1b93 100644
--- a/meta/recipes-devtools/cmake/cmake_4.1.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.1.2.bb