diff options
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index b3cc10ae02..9b1898f22f 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
| @@ -18,6 +18,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | |||
| 18 | 18 | ||
| 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
| 20 | file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ | 20 | file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ |
| 21 | file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \ | ||
| 21 | " | 22 | " |
| 22 | 23 | ||
| 23 | SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" | 24 | SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" |
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch b/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch new file mode 100644 index 0000000000..c719c1fdfb --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
| 3 | Date: Wed, 9 Apr 2025 01:40:46 +0000 | ||
| 4 | Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC | ||
| 5 | values | ||
| 6 | |||
| 7 | 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] | ||
| 8 | Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd] | ||
| 9 | |||
| 10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 11 | --- | ||
| 12 | Source/cmCurl.cxx | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx | ||
| 16 | index b9133ed7..0cf8a71a 100644 | ||
| 17 | --- a/Source/cmCurl.cxx | ||
| 18 | +++ b/Source/cmCurl.cxx | ||
| 19 | @@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, | ||
| 20 | const std::string& netrc_file) | ||
| 21 | { | ||
| 22 | std::string e; | ||
| 23 | - CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST; | ||
| 24 | + long curl_netrc_level = CURL_NETRC_LAST; | ||
| 25 | ::CURLcode res; | ||
| 26 | |||
| 27 | if (!netrc_level.empty()) { | ||
| 28 | -- | ||
| 29 | 2.43.0 | ||
| 30 | |||
