Merge #167671: cmake: Fix a darwin-specific patch
...into staging-next. I assume that applying on non-Darwin was just temporary for testing, so I cut that part to avoid rebuilds.
This commit is contained in:
commit
aab2ab55a4
|
@ -1,23 +1,19 @@
|
|||
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
|
||||
index 9eef01aaf0..d141d4086c 100644
|
||||
--- a/Utilities/cmcurl/CMakeLists.txt
|
||||
+++ b/Utilities/cmcurl/CMakeLists.txt
|
||||
@@ -537,12 +537,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
message(FATAL_ERROR "CoreFoundation framework not found")
|
||||
endif()
|
||||
@@ -391,13 +391,6 @@ if(ENABLE_IPV6 AND NOT WIN32)
|
||||
|
||||
- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
|
||||
- if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
|
||||
- message(FATAL_ERROR "SystemConfiguration framework not found")
|
||||
- endif()
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
|
||||
set(use_core_foundation ON)
|
||||
-
|
||||
- list(APPEND CURL_LIBS "-framework CoreFoundation" "-framework SystemConfiguration")
|
||||
+ list(APPEND CURL_LIBS "-framework CoreFoundation")
|
||||
- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
|
||||
- if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
|
||||
- message(FATAL_ERROR "SystemConfiguration framework not found")
|
||||
- endif()
|
||||
-
|
||||
- list(APPEND CURL_LIBS "-framework SystemConfiguration")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
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 554dcc1e67..059f14e632 100644
|
||||
--- a/Utilities/cmcurl/lib/curl_setup.h
|
||||
+++ b/Utilities/cmcurl/lib/curl_setup.h
|
||||
@@ -257,11 +257,7 @@
|
||||
|
@ -32,8 +28,6 @@ index 554dcc1e67..059f14e632 100644
|
|||
#endif
|
||||
|
||||
#ifdef USE_LWIPSOCK
|
||||
diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c
|
||||
index 117caa2957..9f7c709e44 100644
|
||||
--- a/Utilities/cmcurl/lib/hostip.c
|
||||
+++ b/Utilities/cmcurl/lib/hostip.c
|
||||
@@ -68,10 +68,6 @@
|
||||
|
@ -47,7 +41,7 @@ index 117caa2957..9f7c709e44 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 */
|
||||
@@ -653,23 +649,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
|
||||
@@ -661,23 +657,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
|
||||
return CURLRESOLV_ERROR;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue