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 | 52 |
1 files changed, 52 insertions, 0 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 new file mode 100644 index 00000000000..eddc282dd87 --- /dev/null +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -0,0 +1,52 @@ +On darwin, providing SystemConfiguration to curl currently results in a +reference loop, so we have to disable the check for it and the feature +which requires it (NAT64). + +Patching actual configure script here as we also don't want to require +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 @@ + 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" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + printf "%s\n" "no" >&6; } +@@ -22211,9 +22211,6 @@ + fi + + +-if test "$HAVE_GETHOSTBYNAME" != "1"; then +- as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 +-fi + + + curl_includes_winsock2="\ +diff --git a/lib/curl_setup.h b/lib/curl_setup.h +index 99048c489..19abfbbac 100644 +--- a/lib/curl_setup.h ++++ b/lib/curl_setup.h +@@ -247,19 +247,6 @@ + # include "setup-win32.h" + #endif + +-/* +- * Use getaddrinfo to resolve the IPv4 address literal. If the current network +- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64, +- * performing this task will result in a synthesized IPv6 address. +- */ +-#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 +-# endif +-#endif +- + #ifdef USE_LWIPSOCK + # include <lwip/init.h> + # include <lwip/sockets.h> |