aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/curl/CONTROL7
-rw-r--r--ports/curl/portfile.cmake15
2 files changed, 20 insertions, 2 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index a84dab006..37d1c89ec 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,5 +1,5 @@
Source: curl
-Version: 7.61.1-5
+Version: 7.61.1-6
Build-Depends: zlib
Description: A library for transferring data with URLs
Default-Features: ssl
@@ -15,7 +15,7 @@ Build-Depends: nghttp2, curl[ssl]
Description: HTTP2 support
Feature: ssl
-Build-Depends: curl[openssl] (!windows), curl[winssl] (windows)
+Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
Description: Default SSL backend
Feature: ssh
@@ -33,3 +33,6 @@ Description: SSL support (Secure Channel / "WinSSL")
Feature: mbedtls
Build-Depends: mbedtls
Description: SSL support (mbedTLS)
+
+Feature: darwinssl
+Description: SSL support (darwinssl)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 4c742025b..cbd243641 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -40,6 +40,19 @@ if("mbedtls" IN_LIST FEATURES)
set(USE_MBEDTLS ON)
endif()
+set(USE_DARWINSSL OFF)
+set(DARWINSSL_OPTIONS)
+if("darwinssl" IN_LIST FEATURES)
+ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ message(FATAL_ERROR "darwinssl is not supported on non-Apple platforms")
+ endif()
+ set(USE_DARWINSSL ON)
+ set(DARWINSSL_OPTIONS
+ -DCURL_CA_PATH=none
+ )
+endif()
+
+
# SSH
set(USE_LIBSSH2 OFF)
if("ssh" IN_LIST FEATURES)
@@ -79,6 +92,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
${UWP_OPTIONS}
+ ${DARWINSSL_OPTIONS}
${HTTP2_OPTIONS}
-DBUILD_TESTING=OFF
-DBUILD_CURL_EXE=${BUILD_CURL_EXE}
@@ -87,6 +101,7 @@ vcpkg_configure_cmake(
-DCMAKE_USE_OPENSSL=${USE_OPENSSL}
-DCMAKE_USE_WINSSL=${USE_WINSSL}
-DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
+ -DCMAKE_USE_DARWINSSL=${USE_DARWINSSL}
-DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
-DHTTP_ONLY=${USE_HTTP_ONLY}
OPTIONS_RELEASE