aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpastdue <30942300+past-due@users.noreply.github.com>2021-05-24 18:15:23 -0400
committerGitHub <noreply@github.com>2021-05-24 15:15:23 -0700
commit6608a9cc606a76300bbff6776788a157593f15c1 (patch)
treec3fcfbb0fa6e2ca3af248341c3007f57b8393ef1
parent8f8a4f8aeed0a2eec0cc16137f1641cbd69fe15b (diff)
downloadvcpkg-6608a9cc606a76300bbff6776788a157593f15c1.tar.gz
vcpkg-6608a9cc606a76300bbff6776788a157593f15c1.zip
[curl] Fix mingw to default to winssl (matching windows builds) (#18024)
* [curl] Fix mingw to default to winssl (matching windows builds) * Run x-add-version curl
-rw-r--r--ports/curl/vcpkg.json6
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/c-/curl.json5
3 files changed, 9 insertions, 4 deletions
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 61a578971..e34124382 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "curl",
"version": "7.74.0",
- "port-version": 5,
+ "port-version": 6,
"description": "A library for transferring data with URLs",
"homepage": "https://github.com/curl/curl",
"dependencies": [
@@ -110,7 +110,7 @@
"features": [
"winssl"
],
- "platform": "windows & !uwp"
+ "platform": "(windows & !uwp) | mingw"
},
{
"name": "curl",
@@ -118,7 +118,7 @@
"features": [
"openssl"
],
- "platform": "(uwp | !windows) & !osx"
+ "platform": "(uwp | !windows) & !osx & !mingw"
}
]
},
diff --git a/versions/baseline.json b/versions/baseline.json
index 7a35b7e00..5bfa3de68 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1546,7 +1546,7 @@
},
"curl": {
"baseline": "7.74.0",
- "port-version": 5
+ "port-version": 6
},
"curlpp": {
"baseline": "2018-06-15-3",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index 08fc46d67..e80c018a8 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "73eb56fb6fa870b5959ba36b931817fc85208efe",
+ "version": "7.74.0",
+ "port-version": 6
+ },
+ {
"git-tree": "8be2f3a1be62244a892aeba05026579fbf7200b4",
"version": "7.74.0",
"port-version": 5