diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-06-07 16:05:29 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 12:05:29 -0700 |
| commit | c1c253fabc2d08ddb49ce3f40a7996f79e112545 (patch) | |
| tree | c60aec47fd1ee3998573cfc3b9bc7fe11fbe021b /versions | |
| parent | b8dbf43b081cdd210bcdc2c980b356b4389aad24 (diff) | |
| download | vcpkg-c1c253fabc2d08ddb49ce3f40a7996f79e112545.tar.gz vcpkg-c1c253fabc2d08ddb49ce3f40a7996f79e112545.zip | |
[aws-sdk-cpp] [openssl] Fix iOS build (#17338)
* Add curl try_compile parameters
Don't set compiler when compiling for iOS
* Update OpenSSL and AWS SDK for C++ port versions
* [vcpkg baseline][marble] Disable find I18n
* update version record
* Update versions/a-/aws-sdk-cpp.json
* Update versions/o-/openssl.json
* Fix port-versions after merging master branch
* Update versions/a-/aws-sdk-cpp.json
* Update versions/o-/openssl.json
* Fix merge conflicts
* Merge master branch
* Refactor OpenSSL's build script
* Refactor OpenSSL's build script
* Fix version
* Fix WASM build
* Fix version
* Fix disabled flags
* Disable treating warnings as errors
* Disable treating warnings as errors
* Fix hashes
* fix indentation
* [aws-sdk-cpp] use the powershell file to generate
* Fix versions after merging
* Fix versions after merging
Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/a-/aws-c-common.json | 2 | ||||
| -rw-r--r-- | versions/a-/aws-sdk-cpp.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index a7d7bf26b..03e9c95be 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "afa3b695905711c9699c03d94a77f222396e3346", + "git-tree": "18178de87240278976fc659b52d8a86dbda31329", "version-string": "0.4.56", "port-version": 1 }, diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 0f18d4fe1..23fbba43d 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "13f162ba967b3eaa61320e2062eabd924e1f7a65", + "version": "1.8.126", + "port-version": 10 + }, + { "git-tree": "c23d66191b235f6f388187395b62f38b8e6e35f5", "version": "1.8.126", "port-version": 9 diff --git a/versions/baseline.json b/versions/baseline.json index 29d6aef72..23c5ee5d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -250,7 +250,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 9 + "port-version": 10 }, "azmq": { "baseline": "2020-03-03", @@ -4586,7 +4586,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 3 + "port-version": 4 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 0662553e6..2501d3a22 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "029caa3289fc2b99107efaf987c23fd65f5eac97", + "version-string": "1.1.1k", + "port-version": 4 + }, + { "git-tree": "9f4e7983d2a78b8e865d0444d90ef19ce3a9636c", "version-string": "1.1.1k", "port-version": 3 |