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 /ports/aws-sdk-cpp | |
| 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 'ports/aws-sdk-cpp')
| -rw-r--r-- | ports/aws-sdk-cpp/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/vcpkg.json | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index e2edfda14..2ef408d7a 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -20,6 +20,12 @@ include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) set(EXTRA_ARGS)
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
set(rpath "@loader_path")
+ set(EXTRA_ARGS
+ "-DCURL_HAS_H2_EXITCODE=0"
+ "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
+ "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
+ "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
+ )
elseif (VCPKG_TARGET_IS_ANDROID)
set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
"-DGIT_EXECUTABLE=--invalid-git-executable--"
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 02bb0315a..2ebe3c89f 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aws-sdk-cpp", "version": "1.8.126", - "port-version": 8, + "port-version": 9, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "dependencies": [ |