diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-03 00:14:06 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:59:02 +0100 |
| commit | 47c4c1fe236ee9318838492c95dabc65648eb0ed (patch) | |
| tree | 96f6b1d88e8ee734e412aab0fc3e2e43ad19e7d3 /gnu/packages/patches/cmake-curl-certificates.patch | |
| parent | a4de5cfd2f75f19d751a2f37d758b500bfd19a7e (diff) | |
| download | guix-47c4c1fe236ee9318838492c95dabc65648eb0ed.tar guix-47c4c1fe236ee9318838492c95dabc65648eb0ed.tar.gz | |
gnu: CMake: Update to 3.16.0.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.0.
[arguments]: Adjust for renamed file. Disable test RunCMake.install.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust context.
Diffstat (limited to 'gnu/packages/patches/cmake-curl-certificates.patch')
| -rw-r--r-- | gnu/packages/patches/cmake-curl-certificates.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/patches/cmake-curl-certificates.patch b/gnu/packages/patches/cmake-curl-certificates.patch index 36252083f8..7fe2615271 100644 --- a/gnu/packages/patches/cmake-curl-certificates.patch +++ b/gnu/packages/patches/cmake-curl-certificates.patch @@ -6,19 +6,19 @@ as well as /etc/ssl/certs. --- cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:27:36.926907260 +0200 +++ cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:52:35.475903919 +0200 -@@ -4,11 +4,8 @@ - - #include "cmThirdParty.h" +@@ -2,11 +2,8 @@ + file Copyright.txt or https://cmake.org/licensing for details. */ + #include "cmCurl.h" -#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ - !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) # define CMAKE_FIND_CAFILE # include "cmSystemTools.h" -#endif + #include "cmStringAlgorithms.h" // curl versions before 7.21.5 did not provide this error code - #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 -@@ -29,6 +26,19 @@ std::string cmCurlSetCAInfo(::CURL* curl +@@ -30,6 +27,19 @@ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } |