dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #289254 from matshch/fix-cmake-darwin

Browse Source 
cmake: fix patch for darwin
This commit is contained in:
Jacek Galowicz 2024-02-17 14:24:11 +07:00 committed by GitHub
commit 50b5b5b529
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff
View File

@ -1,6 +1,6 @@
diff -ru cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt
--- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 21:01:32 --- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 23:01:32.000000000 +0300
+++ cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt 2024-01-31 21:20:02 +++ cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt 2024-02-16 13:09:40.805479195 +0300
@@ -470,13 +470,6 @@ @@ -470,13 +470,6 @@
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
@ -15,15 +15,15 @@ diff -ru cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-patched/Utili
endif() endif()
endif() endif()
diff -ru cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h diff -Naur cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h
--- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 21:01:32 --- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 23:01:32.000000000 +0300
+++ cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h 2024-01-31 21:20:50 +++ cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h 2024-02-16 13:10:38.822445566 +0300
@@ -255,12 +255,7 @@ @@ -255,12 +255,6 @@
* performing this task will result in a synthesized IPv6 address. * performing this task will result in a synthesized IPv6 address.
*/ */
#if defined(__APPLE__) && !defined(USE_ARES) #if defined(__APPLE__) && !defined(USE_ARES)
-#include <TargetConditionals.h> -#include <TargetConditionals.h>
- #define USE_RESOLVE_ON_IPS 1 -#define USE_RESOLVE_ON_IPS 1
-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ -# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
- defined(ENABLE_IPV6) - defined(ENABLE_IPV6)
-# define CURL_MACOS_CALL_COPYPROXIES 1 -# define CURL_MACOS_CALL_COPYPROXIES 1