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-c-common | |
| 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-c-common')
| -rw-r--r-- | ports/aws-c-common/CONTROL | 5 | ||||
| -rw-r--r-- | ports/aws-c-common/disable_outline_atomics.patch | 18 | ||||
| -rw-r--r-- | ports/aws-c-common/portfile.cmake | 3 |
3 files changed, 23 insertions, 3 deletions
diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL index 2439c0c65..030d99ee5 100644 --- a/ports/aws-c-common/CONTROL +++ b/ports/aws-c-common/CONTROL @@ -1,5 +1,6 @@ -Source: aws-c-common
+Source: aws-c-common Version: 0.4.56 +Port-Version: 1 Homepage: https://github.com/awslabs/aws-c-common -Description: AWS common library for C
+Description: AWS common library for C Supports: !(arm|uwp)
\ No newline at end of file diff --git a/ports/aws-c-common/disable_outline_atomics.patch b/ports/aws-c-common/disable_outline_atomics.patch new file mode 100644 index 000000000..b3c9e109f --- /dev/null +++ b/ports/aws-c-common/disable_outline_atomics.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake +--- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334) ++++ b/cmake/AwsCFlags.cmake (date 1618758078727) +@@ -70,9 +70,11 @@ + + # -moutline-atomics generates code for both older load/store exclusive atomics and also + # Arm's Large System Extensions (LSE) which scale substantially better on large core count systems +- check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS) +- if (HAS_MOUTLINE_ATOMICS) +- list(APPEND AWS_C_FLAGS -moutline-atomics) ++ if(NOT EMSCRIPTEN AND NOT ANDROID) ++ check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS) ++ if (HAS_MOUTLINE_ATOMICS) ++ list(APPEND AWS_C_FLAGS -moutline-atomics) ++ endif() + endif() + endif() + diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index f3704ef05..12efebc87 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
- REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56 + REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
+ disable_outline_atomics.patch # Disables -moutline-atomics flag which is not supported for wasm32 and Android
)
vcpkg_configure_cmake(
|