mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff -Naur cmake-3.28.1/Utilities/cmcurl/CMakeLists.txt cmake-3.28.1-new/Utilities/cmcurl/CMakeLists.txt
|
|
--- cmake-3.28.1/Utilities/cmcurl/CMakeLists.txt 2023-12-14 10:47:27.000000000 -0500
|
|
+++ cmake-3.28.1-new/Utilities/cmcurl/CMakeLists.txt 2024-01-08 14:45:45.000000000 -0500
|
|
@@ -470,13 +470,6 @@
|
|
|
|
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
|
|
set(use_core_foundation_and_core_services ON)
|
|
-
|
|
- 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()
|
|
|
|
diff -Naur cmake-3.28.1/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.1-new/Utilities/cmcurl/lib/curl_setup.h
|
|
--- cmake-3.28.1/Utilities/cmcurl/lib/curl_setup.h 2023-12-14 10:47:27.000000000 -0500
|
|
+++ cmake-3.28.1-new/Utilities/cmcurl/lib/curl_setup.h 2024-01-08 14:45:08.000000000 -0500
|
|
@@ -255,12 +255,6 @@
|
|
* 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 TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
|
|
- defined(ENABLE_IPV6)
|
|
-# define CURL_MACOS_CALL_COPYPROXIES 1
|
|
-# endif
|
|
#endif
|
|
|
|
#ifdef USE_LWIPSOCK
|