summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2025-09-19 01:43:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-22 22:09:48 +0100
commit4127c62538adfbcaa8885c5faf4cbb7107f60997 (patch)
treecff3619f02d096d0ae276bab7cbe40105e1eaf75 /meta
parentfd740c664a7dd24d13a68cf7cfb4ccf2c2987515 (diff)
downloadpoky-4127c62538adfbcaa8885c5faf4cbb7107f60997.tar.gz
cmake: Backport a patch to build with curl 8.16.0
Needed to build cmake and nativesdk-cmake (cmake-native is built without curl support). (From OE-Core rev: a82aa37cfe037782877b4a1a4c05ac44c184099c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc1
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch35
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index cbeeb31520..b2d3d60ef9 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -17,6 +17,7 @@ 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 \
20 " 21 "
21 22
22SRC_URI[sha256sum] = "81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508" 23SRC_URI[sha256sum] = "81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508"
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
new file mode 100644
index 0000000000..d04d0be795
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
@@ -0,0 +1,35 @@
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