diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-05-26 18:03:32 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 14:03:32 -0700 |
| commit | f519430b0f96b6654a0f8b341089585403ab47fd (patch) | |
| tree | 6a729a157e003abf767cca2578b33bf6ef8ebf9b /versions/o- | |
| parent | 37a5a94f486e6c1576b418bcbd36fc8bfb31c0b0 (diff) | |
| download | vcpkg-f519430b0f96b6654a0f8b341089585403ab47fd.tar.gz vcpkg-f519430b0f96b6654a0f8b341089585403ab47fd.zip | |
[openssl] [aws-c-common] Fix AWS SDK for C++ build on WASM32 and Android (#17348)
* 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
* Fix AWS C Common build for WASM32
* Fix OpenSSL build for WASM32
* Update AWS C Common and OpenSSL versions
* Update versions/a-/aws-sdk-cpp.json
* Update versions/o-/openssl.json
* Fix port-versions after merging master branch
* Fix port-versions after merging master branch
* Update versions/o-/openssl.json
* Update versions/a-/aws-sdk-cpp.json
* Update versions/o-/openssl.json
* Fix merge conflicts
* Fix merge conflicts
* Update ports/aws-c-common/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update versions/a-/aws-c-common.json
* Update versions/o-/openssl.json
* Update versions/o-/openssl.json
* Update versions/o-/openssl.json
* Update ports/openssl/CONTROL
* Merge master branch and resolve merge conflicts
* Disable -moutline-atomics in Android also
* Revert line ending change
* Fix version info
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: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'versions/o-')
| -rw-r--r-- | versions/o-/openssl.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index c0771f1a5..5e5641dac 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dcaa59e72471884bf333486e49be386dd4a3da4f", + "version-string": "1.1.1k", + "port-version": 2 + }, + { "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201", "version-string": "1.1.1k", "port-version": 1 |