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 /ports/aws-c-common | |
| 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 'ports/aws-c-common')
| -rw-r--r-- | ports/aws-c-common/disable-internal-crt-option.patch | 2 | ||||
| -rw-r--r-- | ports/aws-c-common/disable_warnings_as_errors.patch | 12 | ||||
| -rw-r--r-- | ports/aws-c-common/portfile.cmake | 11 |
3 files changed, 19 insertions, 6 deletions
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch index 573d83773..6fec4b214 100644 --- a/ports/aws-c-common/disable-internal-crt-option.patch +++ b/ports/aws-c-common/disable-internal-crt-option.patch @@ -16,5 +16,5 @@ index 249b7d5..41a31e2 100644 - list(APPEND AWS_C_FLAGS "${_FLAGS}") - else() - list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes) + list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) diff --git a/ports/aws-c-common/disable_warnings_as_errors.patch b/ports/aws-c-common/disable_warnings_as_errors.patch new file mode 100644 index 000000000..0d8605dee --- /dev/null +++ b/ports/aws-c-common/disable_warnings_as_errors.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake +--- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334) ++++ b/cmake/AwsCFlags.cmake (date 1622068907622) +@@ -48,7 +48,7 @@ + list(APPEND AWS_C_FLAGS "${_FLAGS}") + + else() +- list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes) ++ list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) + + if(NOT SET_PROPERTIES_NO_WEXTRA) + list(APPEND AWS_C_FLAGS -Wextra) diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 12efebc87..f7dd6c426 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
+ disable_warnings_as_errors.patch # Ref https://github.com/awslabs/aws-c-common/pull/798
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
@@ -22,14 +23,14 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/include
- ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common
- ${CURRENT_PACKAGES_DIR}/lib/aws-c-common
- )
+ ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common
+ ${CURRENT_PACKAGES_DIR}/lib/aws-c-common
+ )
vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|