mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 07:31:01 +02:00
overlay coreos/user-patches: Add a user patch fixing build with new curl
This commit is contained in:
parent
a212ddd28c
commit
9ec2ac6111
@ -0,0 +1,36 @@
|
|||||||
|
https://bugs.gentoo.org/953060
|
||||||
|
https://gitlab.kitware.com/cmake/cmake/-/issues/26754
|
||||||
|
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449
|
||||||
|
|
||||||
|
From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brad King <brad.king@kitware.com>
|
||||||
|
Date: Mon, 10 Mar 2025 11:08:42 -0400
|
||||||
|
Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
|
||||||
|
values
|
||||||
|
|
||||||
|
Since upstream curl commit `2ec00372a1` (curl.h: change some enums to
|
||||||
|
defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are
|
||||||
|
integer literals instead of `enum CURL_NETRC_OPTION`. It turns out
|
||||||
|
that `curl_easy_setopt` has always expected a `long` anyway, and
|
||||||
|
that `CURL_NETRC_OPTION` is not documented for public use.
|
||||||
|
|
||||||
|
Fixes: #26754
|
||||||
|
---
|
||||||
|
Source/cmCurl.cxx | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
|
||||||
|
index b9133ed7d47..0cf8a71a72d 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()) {
|
||||||
|
--
|
||||||
|
GitLab
|
3
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md
vendored
Normal file
3
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
The `0001-fix-build-with-curl-8-13-0.patch` was taken from Gentoo -
|
||||||
|
the patched cmake is 3.31.6-r1, so if we get updated to that version
|
||||||
|
or later, we can drop the patch.
|
Loading…
x
Reference in New Issue
Block a user