Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a41eaa9
Add curl try_compile parameters
Apr 18, 2021
1fddc96
Update OpenSSL and AWS SDK for C++ port versions
ahmedalnuaimi Apr 18, 2021
d9ee2ea
[vcpkg baseline][marble] Disable find I18n
Apr 18, 2021
8cca02b
update version record
Apr 18, 2021
3d432d0
Fix AWS C Common build for WASM32
Apr 18, 2021
a6feb5e
Fix OpenSSL build for WASM32
Apr 18, 2021
9658a7e
Update AWS C Common and OpenSSL versions
Apr 18, 2021
d94abb8
Merge branch 'dev/jack/fix_baseline_20210418' of https://github.com/J…
ahmedalnuaimi Apr 18, 2021
c0e2f49
Merge branch 'dev/jack/fix_baseline_20210418' of https://github.com/J…
ahmedalnuaimi Apr 18, 2021
a0c4c26
Update versions/a-/aws-sdk-cpp.json
JackBoosY Apr 19, 2021
49f07bd
Update versions/o-/openssl.json
JackBoosY Apr 19, 2021
f6a81c1
Merge branch 'master' of https://github.com/Microsoft/vcpkg into aws_…
ahmedalnuaimi Apr 19, 2021
f0002c6
Merge branch 'master' of https://github.com/Microsoft/vcpkg into aws_…
ahmedalnuaimi Apr 19, 2021
aaace18
Merge branch 'master' of https://github.com/Microsoft/vcpkg into aws_…
ahmedalnuaimi Apr 20, 2021
e3a99fc
Fix port-versions after merging master branch
ahmedalnuaimi Apr 20, 2021
a5cfcf0
Merge branch 'master' of https://github.com/Microsoft/vcpkg into aws_…
ahmedalnuaimi Apr 20, 2021
41615ed
Merge branch 'master' of https://github.com/Microsoft/vcpkg into fix_…
ahmedalnuaimi Apr 20, 2021
5d48274
Fix port-versions after merging master branch
ahmedalnuaimi Apr 20, 2021
0df627c
Update versions/o-/openssl.json
JackBoosY Apr 21, 2021
93d03ba
Update versions/a-/aws-sdk-cpp.json
JackBoosY Apr 21, 2021
dc310c3
Update versions/o-/openssl.json
JackBoosY Apr 21, 2021
0bab19e
Merge branch 'master' into fix_aws_wasm
ras0219-msft Apr 23, 2021
21b623d
Merge branch 'master' of https://github.com/Microsoft/vcpkg into aws_…
ahmedalnuaimi Apr 24, 2021
7125a75
Fix merge conflicts
ahmedalnuaimi Apr 24, 2021
0c4efeb
Merge branch 'aws_sdk_ios' of https://github.com/ahmedyarub/vcpkg int…
ahmedalnuaimi Apr 24, 2021
284eba0
Fix merge conflicts
ahmedalnuaimi Apr 24, 2021
c54d6bf
Merge remote-tracking branch 'ahmedyarub/fix_aws_wasm' into fix_aws_wasm
ahmedalnuaimi Apr 24, 2021
1e77b84
Update ports/aws-c-common/portfile.cmake
Apr 24, 2021
dafef4b
Update versions/a-/aws-c-common.json
JackBoosY Apr 25, 2021
d0fdd8b
Update versions/o-/openssl.json
JackBoosY Apr 25, 2021
8ec2e26
Update versions/o-/openssl.json
JackBoosY Apr 25, 2021
24fb7a0
Update versions/o-/openssl.json
JackBoosY Apr 25, 2021
6fd226b
Update ports/openssl/CONTROL
JackBoosY Apr 25, 2021
e3780fb
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 9, 2021
f8644b8
Merge master branch and resolve merge conflicts
ahmedalnuaimi May 9, 2021
5c3ae62
Disable -moutline-atomics in Android also
ahmedalnuaimi May 9, 2021
6f0e4b9
Revert line ending change
ahmedalnuaimi May 9, 2021
7733264
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 14, 2021
eabd630
Fix version info
ahmedalnuaimi May 17, 2021
4a48acd
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 17, 2021
68d6104
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 17, 2021
e8e10e0
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 18, 2021
6d1c020
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
ahmedalnuaimi May 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ports/aws-c-common/CONTROL
Original file line number Diff line number Diff line change
@@ -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)
18 changes: 18 additions & 0 deletions ports/aws-c-common/disable_outline_atomics.patch
Original file line number Diff line number Diff line change
@@ -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()

3 changes: 2 additions & 1 deletion ports/aws-c-common/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
6 changes: 6 additions & 0 deletions ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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--"
Expand Down
2 changes: 1 addition & 1 deletion ports/aws-sdk-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
Loading