The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose darwinssl as an option when building curl (updated) (#6124)

Browse Source 
* expose darwinssl as an option

* Fix typo

* add an error in case darwinssl is used on a non darwin system

* [curl] add darwinssl to curl[ssl] osx default

* [curl] Bump CONTROL version
This commit is contained in:
past-due 2019-04-17 17:27:48 -04:00 committed by Phil Christensen
parent d8e168c1e8
commit 2112801aba
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/curl/CONTROL
View File

@ -1,5 +1,5 @@
Source: curl Source: curl
Version: 7.61.1-5 Version: 7.61.1-6
Build-Depends: zlib Build-Depends: zlib
Description: A library for transferring data with URLs Description: A library for transferring data with URLs
Default-Features: ssl Default-Features: ssl
@ -15,7 +15,7 @@ Build-Depends: nghttp2, curl[ssl]
Description: HTTP2 support Description: HTTP2 support
Feature: ssl 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 Description: Default SSL backend
Feature: ssh Feature: ssh
@ -33,3 +33,6 @@ Description: SSL support (Secure Channel / "WinSSL")
Feature: mbedtls Feature: mbedtls
Build-Depends: mbedtls Build-Depends: mbedtls
Description: SSL support (mbedTLS) Description: SSL support (mbedTLS)
Feature: darwinssl
Description: SSL support (darwinssl)

15
ports/curl/portfile.cmake
View File

@ -40,6 +40,19 @@ if("mbedtls" IN_LIST FEATURES)
set(USE_MBEDTLS ON) set(USE_MBEDTLS ON)
endif() 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 # SSH
set(USE_LIBSSH2 OFF) set(USE_LIBSSH2 OFF)
if("ssh" IN_LIST FEATURES) if("ssh" IN_LIST FEATURES)
@ -79,6 +92,7 @@ vcpkg_configure_cmake(
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
${UWP_OPTIONS} ${UWP_OPTIONS}
${DARWINSSL_OPTIONS}
${HTTP2_OPTIONS} ${HTTP2_OPTIONS}
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF
-DBUILD_CURL_EXE=${BUILD_CURL_EXE} -DBUILD_CURL_EXE=${BUILD_CURL_EXE}
@ -87,6 +101,7 @@ vcpkg_configure_cmake(
-DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_OPENSSL=${USE_OPENSSL}
-DCMAKE_USE_WINSSL=${USE_WINSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL}
-DCMAKE_USE_MBEDTLS=${USE_MBEDTLS} -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
-DCMAKE_USE_DARWINSSL=${USE_DARWINSSL}
-DCMAKE_USE_LIBSSH2=${USE_LIBSSH2} -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
-DHTTP_ONLY=${USE_HTTP_ONLY} -DHTTP_ONLY=${USE_HTTP_ONLY}
OPTIONS_RELEASE OPTIONS_RELEASE