cmake: 3.21.2 -> 3.22.1 (#147818)
https://cmake.org/cmake/help/latest/release/3.22.html Co-authored-by: Winter <winter@winter.cafe>
This commit is contained in:
Sergei Trofimovich
GitHub
parent
05cfc5fdab
commit
653ff61cb6
2 changed files with 29 additions and 45 deletions
|
|
@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
|
|||
+ lib.optionalString isBootstrap "-boot"
|
||||
+ lib.optionalString useNcurses "-cursesUI"
|
||||
+ lib.optionalString withQt5 "-qt5UI";
|
||||
version = "3.21.2";
|
||||
version = "3.22.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
|
||||
sha256 = "sha256-lCdeC2HIS7QnEPUyCiPG3LLG7gMq59KmFvU/aLPSFlk=";
|
||||
sha256 = "sha256-DpmCKVSdez82hwPSDiSOfuH4U5ENQnBKqHkYwhPqgsA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,43 +1,26 @@
|
|||
From 76523ca5b2227085bb65253900e866b08a2b5efb Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mayer <tobim@fastmail.fm>
|
||||
Date: Fri, 30 Jul 2021 10:50:16 +0200
|
||||
Subject: [PATCH] Disable NAT64 address synthesis on darwin
|
||||
|
||||
This intentionally breaks the feature by partially reverting
|
||||
https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51
|
||||
|
||||
This is a stop-gap to get CMake to build without the SystemConfiguration
|
||||
framework.
|
||||
---
|
||||
Utilities/cmcurl/CMakeLists.txt | 8 --------
|
||||
Utilities/cmcurl/lib/curl_setup.h | 4 ----
|
||||
Utilities/cmcurl/lib/hostip.c | 17 -----------------
|
||||
3 files changed, 29 deletions(-)
|
||||
|
||||
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
|
||||
index 16ef037ccc..17564bbb69 100644
|
||||
index 9eef01aaf0..d141d4086c 100644
|
||||
--- a/Utilities/cmcurl/CMakeLists.txt
|
||||
+++ b/Utilities/cmcurl/CMakeLists.txt
|
||||
@@ -511,14 +511,6 @@ if(CMAKE_USE_SECTRANSP)
|
||||
list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}")
|
||||
endif()
|
||||
@@ -537,12 +537,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
message(FATAL_ERROR "CoreFoundation framework not found")
|
||||
endif()
|
||||
|
||||
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
|
||||
- if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
|
||||
- message(FATAL_ERROR "SystemConfiguration framework not found")
|
||||
- endif()
|
||||
- list(APPEND CURL_LIBS "${SYSTEMCONFIGURATION_FRAMEWORK}")
|
||||
-endif()
|
||||
-
|
||||
if(CMAKE_USE_OPENSSL)
|
||||
find_package(OpenSSL)
|
||||
if(NOT OpenSSL_FOUND)
|
||||
- list(APPEND CURL_LIBS "-framework CoreFoundation" "-framework SystemConfiguration")
|
||||
+ list(APPEND CURL_LIBS "-framework CoreFoundation")
|
||||
|
||||
if(CMAKE_USE_SECTRANSP)
|
||||
find_library(SECURITY_FRAMEWORK "Security")
|
||||
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h
|
||||
index 2d13a40a55..35160bc0f5 100644
|
||||
index 554dcc1e67..059f14e632 100644
|
||||
--- a/Utilities/cmcurl/lib/curl_setup.h
|
||||
+++ b/Utilities/cmcurl/lib/curl_setup.h
|
||||
@@ -251,11 +251,7 @@
|
||||
@@ -257,11 +257,7 @@
|
||||
* performing this task will result in a synthesized IPv6 address.
|
||||
*/
|
||||
#if defined(__APPLE__) && !defined(USE_ARES)
|
||||
|
|
@ -50,7 +33,7 @@ index 2d13a40a55..35160bc0f5 100644
|
|||
|
||||
#ifdef USE_LWIPSOCK
|
||||
diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c
|
||||
index e0e3cfc2cb..45190a100b 100644
|
||||
index 117caa2957..9f7c709e44 100644
|
||||
--- a/Utilities/cmcurl/lib/hostip.c
|
||||
+++ b/Utilities/cmcurl/lib/hostip.c
|
||||
@@ -68,10 +68,6 @@
|
||||
|
|
@ -64,26 +47,27 @@ index e0e3cfc2cb..45190a100b 100644
|
|||
#if defined(CURLRES_SYNCH) && \
|
||||
defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
|
||||
/* alarm-based timeouts can only be used with all the dependencies satisfied */
|
||||
@@ -533,19 +529,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
|
||||
@@ -653,23 +649,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
|
||||
return CURLRESOLV_ERROR;
|
||||
}
|
||||
|
||||
-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
|
||||
- /*
|
||||
- * The automagic conversion from IPv4 literals to IPv6 literals only works
|
||||
- * if the SCDynamicStoreCopyProxies system function gets called first. As
|
||||
- * Curl currently doesn't support system-wide HTTP proxies, we therefore
|
||||
- * don't use any value this function might return.
|
||||
- *
|
||||
- * This function is only available on a macOS and is not needed for
|
||||
- * IPv4-only builds, hence the conditions above.
|
||||
- */
|
||||
- SCDynamicStoreCopyProxies(NULL);
|
||||
- {
|
||||
- /*
|
||||
- * The automagic conversion from IPv4 literals to IPv6 literals only
|
||||
- * works if the SCDynamicStoreCopyProxies system function gets called
|
||||
- * first. As Curl currently doesn't support system-wide HTTP proxies, we
|
||||
- * therefore don't use any value this function might return.
|
||||
- *
|
||||
- * This function is only available on a macOS and is not needed for
|
||||
- * IPv4-only builds, hence the conditions above.
|
||||
- */
|
||||
- CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
|
||||
- if(dict)
|
||||
- CFRelease(dict);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
#ifndef USE_RESOLVE_ON_IPS
|
||||
/* First check if this is an IPv4 address string */
|
||||
if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue