Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / by-name / cm / cmake / 005-remove-systemconfiguration-dep.diff
blobffd3077d301e69d961c234e309ad55ca4ee9e9e8
1 diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt
2 --- cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt 2023-10-06 10:08:35.000000000 -0300
3 +++ cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt 2023-10-22 21:51:09.231609901 -0300
4 @@ -414,13 +414,6 @@
6 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
7 set(use_core_foundation ON)
9 - find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
10 - if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
11 - message(FATAL_ERROR "SystemConfiguration framework not found")
12 - endif()
14 - list(APPEND CURL_LIBS "-framework SystemConfiguration")
15 endif()
16 endif()
18 diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h
19 --- cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h 2023-10-06 10:08:35.000000000 -0300
20 +++ cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h 2023-10-22 21:52:00.214748294 -0300
21 @@ -260,11 +260,7 @@
22 * performing this task will result in a synthesized IPv6 address.
24 #if defined(__APPLE__) && !defined(USE_ARES)
25 -#include <TargetConditionals.h>
26 #define USE_RESOLVE_ON_IPS 1
27 -# if defined(TARGET_OS_OSX) && TARGET_OS_OSX
28 -# define CURL_OSX_CALL_COPYPROXIES 1
29 -# endif
30 #endif
32 #ifdef USE_LWIPSOCK
33 diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/hostip.c cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c
34 --- cmake-3.27.7/Utilities/cmcurl/lib/hostip.c 2023-10-06 10:08:35.000000000 -0300
35 +++ cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c 2023-10-22 21:53:29.249989934 -0300
36 @@ -67,10 +67,6 @@
37 #include "curl_memory.h"
38 #include "memdebug.h"
40 -#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
41 -#include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
42 -#endif
44 #if defined(CURLRES_SYNCH) && \
45 defined(HAVE_ALARM) && \
46 defined(SIGALRM) && \
47 @@ -743,23 +739,6 @@
48 return CURLRESOLV_ERROR;
51 -#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
52 - {
53 - /*
54 - * The automagic conversion from IPv4 literals to IPv6 literals only
55 - * works if the SCDynamicStoreCopyProxies system function gets called
56 - * first. As Curl currently doesn't support system-wide HTTP proxies, we
57 - * therefore don't use any value this function might return.
58 - *
59 - * This function is only available on a macOS and is not needed for
60 - * IPv4-only builds, hence the conditions above.
61 - */
62 - CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
63 - if(dict)
64 - CFRelease(dict);
65 - }
66 -#endif
68 #ifndef USE_RESOLVE_ON_IPS
69 /* First check if this is an IPv4 address string */
70 if(Curl_inet_pton(AF_INET, hostname, &in) > 0)