mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
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>
This commit is contained in:
parent
51f694db18
commit
5c8f6f30ff
|
|
@ -17,10 +17,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \
|
|||
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-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "b29f6f19733aa224b7763507a108a427ed48c688e1faf22b29c44e1c30549282"
|
||||
SRC_URI[sha256sum] = "643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001
|
||||
From: Brad King <brad.king@kitware.com>
|
||||
Date: Tue, 2 Sep 2025 11:41:10 -0400
|
||||
Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
|
||||
CURLOPT_PROXYTYPE values
|
||||
|
||||
Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
|
||||
enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
|
||||
are integer literals instead of `enum curl_proxytype`. It turns out
|
||||
that `curl_easy_setopt` has always expected a `long` anyway, and that
|
||||
`curl_proxytype` is not documented for public use.
|
||||
|
||||
Fixes: #27178
|
||||
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
||||
Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/commit/c8143074cf3954b1e169904eb9d843cfbe14acc3]
|
||||
---
|
||||
Source/CTest/cmCTestCurl.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
|
||||
index 7836f4b9c7..9113890b5a 100644
|
||||
--- a/Source/CTest/cmCTestCurl.h
|
||||
+++ b/Source/CTest/cmCTestCurl.h
|
||||
@@ -52,7 +52,7 @@ private:
|
||||
std::vector<std::string> HttpHeaders;
|
||||
std::string HTTPProxyAuth;
|
||||
std::string HTTPProxy;
|
||||
- curl_proxytype HTTPProxyType;
|
||||
+ long HTTPProxyType;
|
||||
bool UseHttp10 = false;
|
||||
bool Quiet = false;
|
||||
int TimeOutSeconds = 0;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user