Skip to content

Commit cf3e688

Browse files
JackBoosYJackBoosY
authored
[aws-*]Update version (#8832)
* [aws-c-common]Upgrade to 0.4.15 * [aws-c-common]Fix cmake target path. * [aws-c-event-stream]Upgrade to 0.1.4 * [aws-checksums]Upgrade to 0.1.5 [aws-c-event-stream]Fix cmake target path. [aws-lambda-cpp]Upgrade to 0.2.4 [aws-sdk-cpp]Upgrade to 1.7.214 * [aws=sdk-cpp]Set feature AWSMigrationHub to lowercase. * [aws-lambda-cpp] Drop support with OSX
1 parent 8bb07e2 commit cf3e688

17 files changed

+150
-83
lines changed

‎ports/aws-c-common/CONTROL‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Source: aws-c-common
2-
Version: 0.4.1
2+
Version: 0.4.15
3+
Homepage: https://github.com/awslabs/aws-c-common
34
Description: AWS common library for C

‎ports/aws-c-common/disable-error-4068.patch‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 263d34e..8c699b7 100644
3-
--- a/CMakeLists.txt
4-
+++ b/CMakeLists.txt
5-
@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
6-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
7-
endif()
8-
9-
+if (WIN32)
10-
+ add_compile_options(/wd4068)
11-
+endif()
12-
+
13-
aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
14-
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
15-
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 79c66c3..f6639d7 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
6+
#this only gets applied to aws-c-common (not its consumers).
7+
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
8+
endif()
9+
+
10+
+if (WIN32)
11+
+ add_compile_options(/wd4068)
12+
+endif()
13+
14+
aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
15+
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})

‎ports/aws-c-common/disable-internal-crt-option.patch‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
2-
index 0f597d7..1359b8b 100644
3-
--- a/cmake/AwsCFlags.cmake
4-
+++ b/cmake/AwsCFlags.cmake
5-
@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
6-
# /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
7-
# Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
8-
list(APPEND AWS_C_FLAGS /volatile:iso)
9-
-
10-
- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
11-
- if(STATIC_CRT)
12-
- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
13-
- else()
14-
- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
15-
- endif()
16-
- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
17-
- list(APPEND AWS_C_FLAGS "${_FLAGS}")
18-
19-
else()
20-
list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
1+
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
2+
index 42d146e..813f56d 100644
3+
--- a/cmake/AwsCFlags.cmake
4+
+++ b/cmake/AwsCFlags.cmake
5+
@@ -39,15 +39,6 @@ function(aws_set_common_properties target)
6+
# Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
7+
list(APPEND AWS_C_FLAGS /volatile:iso)
8+
9+
- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
10+
- if(STATIC_CRT)
11+
- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
12+
- else()
13+
- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
14+
- endif()
15+
- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
16+
- list(APPEND AWS_C_FLAGS "${_FLAGS}")
17+
-
18+
else()
19+
list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
20+

‎ports/aws-c-common/fix-cmake-target-path.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 433b6c5..41874a0 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -209,7 +209,7 @@ else()
6+
endif()
7+
8+
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
9+
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
10+
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
11+
NAMESPACE AWS::
12+
COMPONENT Development)
13+
14+
diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
15+
index c322b52..6e5daa0 100644
16+
--- a/cmake/aws-c-common-config.cmake
17+
+++ b/cmake/aws-c-common-config.cmake
18+
@@ -1,9 +1,5 @@
19+
set(THREADS_PREFER_PTHREAD_FLAG ON)
20+
find_package(Threads REQUIRED)
21+
22+
-if (BUILD_SHARED_LIBS)
23+
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
24+
-else()
25+
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
26+
-endif()
27+
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])
28+

‎ports/aws-c-common/portfile.cmake‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
include(vcpkg_common_functions)
2-
31
vcpkg_from_github(
42
OUT_SOURCE_PATH SOURCE_PATH
53
REPO awslabs/aws-c-common
6-
REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
7-
SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
4+
REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
5+
SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023
86
HEAD_REF master
97
PATCHES
108
disable-error-4068.patch # This patch fixes dependency port compilation failure
119
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
10+
fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
1211
)
1312

1413
vcpkg_configure_cmake(
@@ -29,9 +28,7 @@ file(REMOVE_RECURSE
2928

3029
vcpkg_copy_pdbs()
3130

32-
# Handle copyright
33-
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright)
31+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
3432

35-
file(REMOVE_RECURSE
36-
${CURRENT_PACKAGES_DIR}/debug/share
37-
)
33+
# Handle copyright
34+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

‎ports/aws-c-event-stream/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Source: aws-c-event-stream
2-
Version: 0.1.1
2+
Version: 0.1.4
33
Description: C99 implementation of the vnd.amazon.event-stream content-type.
44
Build-Depends: aws-c-common, aws-checksums

‎ports/aws-c-event-stream/fix-cmake-target-path.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index a765be0..4ade373 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -101,7 +101,7 @@ else()
6+
endif()
7+
8+
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
9+
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
10+
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
11+
NAMESPACE AWS::
12+
COMPONENT Development)
13+
14+
diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
15+
index 7bd3cfc..cb817e4 100644
16+
--- a/cmake/aws-c-event-stream-config.cmake
17+
+++ b/cmake/aws-c-event-stream-config.cmake
18+
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
19+
find_dependency(aws-c-common)
20+
find_dependency(aws-checksums)
21+
22+
-if (BUILD_SHARED_LIBS)
23+
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
24+
-else()
25+
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
26+
-endif()
27+
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])
28+

‎ports/aws-c-event-stream/portfile.cmake‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
include(vcpkg_common_functions)
2-
31
vcpkg_from_github(
42
OUT_SOURCE_PATH SOURCE_PATH
53
REPO awslabs/aws-c-event-stream
6-
REF v0.1.1
7-
SHA512 974311cdface59bb5a95c7c249ad31cf694ebefd5c7b25f280f6817c6dc8d9ab1fdc8f75030099efe573be41a93676f199fda797d2a7bb41533f7e15f05de120
4+
REF 32713d30b479690d199b3f02163a832b09b309a5 #v0.1.4
5+
SHA512 c1f776b708cd4a68afbcc60e046dcfa3f7c1d378e7bf49ba7f93b3db3a248218316e5037254709320cd50efd6486996aa09678f41499fcea810adea16463ff4b
86
HEAD_REF master
7+
PATCHES fix-cmake-target-path.patch
98
)
109

1110
vcpkg_configure_cmake(
@@ -27,9 +26,7 @@ file(REMOVE_RECURSE
2726

2827
vcpkg_copy_pdbs()
2928

30-
# Handle copyright
31-
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-event-stream RENAME copyright)
29+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
3230

33-
file(REMOVE_RECURSE
34-
${CURRENT_PACKAGES_DIR}/debug/share
35-
)
31+
# Handle copyright
32+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

‎ports/aws-checksums/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Source: aws-checksums
2-
Version: 0.1.3
2+
Version: 0.1.5
33
Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.

‎ports/aws-checksums/fix-cmake-target-path.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 2ae2229..c4d0c2d 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -138,7 +138,7 @@ else()
6+
endif()
7+
8+
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
9+
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
10+
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
11+
NAMESPACE AWS::)
12+
13+
configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
14+
diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake
15+
index f0785bf..1b9b2d2 100644
16+
--- a/cmake/aws-checksums-config.cmake
17+
+++ b/cmake/aws-checksums-config.cmake
18+
@@ -1,6 +1 @@
19+
-if (BUILD_SHARED_LIBS)
20+
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
21+
-else()
22+
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
23+
-endif()
24+
-
25+
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])

0 commit comments

Comments
 (0)