diff options
Diffstat (limited to 'pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch')
| -rw-r--r-- | pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch index 2c732621d92..088f9b4032d 100644 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -7,11 +7,11 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. --- a/configure 2021-10-16 00:51:59.000000000 +0100 +++ b/configure 2021-10-16 01:06:46.000000000 +0100 -@@ -20810,7 +20810,7 @@ +@@ -21556,7 +221556,7 @@ if test "x$build_for_macos" != xno; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration" +- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration" + LDFLAGS="$LDFLAGS -framework CoreFoundation" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -27,13 +27,13 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. curl_includes_winsock2="\ diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index 727d123e5..f78d8be4a 100644 +index b43714da7..7674778b7 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h -@@ -250,19 +250,6 @@ - +@@ -250,20 +250,6 @@ + #include <curl/system.h> - + -/* - * Use getaddrinfo to resolve the IPv4 address literal. If the current network - * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64, @@ -42,8 +42,9 @@ index 727d123e5..f78d8be4a 100644 -#if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> -#define USE_RESOLVE_ON_IPS 1 --# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX --# define CURL_OSX_CALL_COPYPROXIES 1 +-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ +- defined(ENABLE_IPV6) +-# define CURL_MACOS_CALL_COPYPROXIES 1 -# endif -#endif - |