mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:39:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[curl] Don't try to include OpenSSL headers when OpenSSL backends aren't selected. (#24766)

Browse Source 
Fixes regression introduced in https://github.com/microsoft/vcpkg/pull/24348
This commit is contained in:
Billy O'Neal 2022-05-17 23:56:02 -07:00 committed by GitHub
parent 68c6835c82
commit 0a6002ef25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/curl/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "curl", "name": "curl",
"version": "7.83.1", "version": "7.83.1",
"port-version": 1, "port-version": 2,
"description": "A library for transferring data with URLs", "description": "A library for transferring data with URLs",
"homepage": "https://curl.se/", "homepage": "https://curl.se/",
"license": null, "license": null,

2
ports/curl/wolfssl-ntlm.patch
View File

@ -32,7 +32,7 @@ diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
# include <wolfssl/options.h> # include <wolfssl/options.h>
-#endif -#endif
+# include <wolfssl/openssl/ssl.h> +# include <wolfssl/openssl/ssl.h>
+#else +#elif defined(USE_OPENSSL)
# include <openssl/ssl.h> # include <openssl/ssl.h>
#endif #endif

2
versions/baseline.json
View File

@ -1746,7 +1746,7 @@
}, },
"curl": { "curl": {
"baseline": "7.83.1", "baseline": "7.83.1",
"port-version": 1 "port-version": 2
}, },
"curlpp": { "curlpp": {
"baseline": "2018-06-15", "baseline": "2018-06-15",

5
versions/c-/curl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0",
"version": "7.83.1",
"port-version": 2
},
{ {
"git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a", "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a",
"version": "7.83.1", "version": "7.83.1",