aboutsummaryrefslogtreecommitdiff
path: root/versions/o-
diff options
context:
space:
mode:
authorAhmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>2021-06-07 16:05:29 -0300
committerGitHub <noreply@github.com>2021-06-07 12:05:29 -0700
commitc1c253fabc2d08ddb49ce3f40a7996f79e112545 (patch)
treec60aec47fd1ee3998573cfc3b9bc7fe11fbe021b /versions/o-
parentb8dbf43b081cdd210bcdc2c980b356b4389aad24 (diff)
downloadvcpkg-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/o-')
-rw-r--r--versions/o-/openssl.json5
1 files changed, 5 insertions, 0 deletions
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