aboutsummaryrefslogtreecommitdiff
path: root/ports/aws-c-common
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-01-31 06:43:34 +0800
committerGitHub <noreply@github.com>2020-01-30 14:43:34 -0800
commitcf3e688dda65b2a6d4729edcaf83e99b32c92fd1 (patch)
treedf5e3a1c81167e13d7461394d7327188e3ec2423 /ports/aws-c-common
parent8bb07e21cac10c7f5c5406878adba03b799c0954 (diff)
downloadvcpkg-cf3e688dda65b2a6d4729edcaf83e99b32c92fd1.tar.gz
vcpkg-cf3e688dda65b2a6d4729edcaf83e99b32c92fd1.zip
[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
Diffstat (limited to 'ports/aws-c-common')
-rw-r--r--ports/aws-c-common/CONTROL3
-rw-r--r--ports/aws-c-common/disable-error-4068.patch30
-rw-r--r--ports/aws-c-common/disable-internal-crt-option.patch40
-rw-r--r--ports/aws-c-common/fix-cmake-target-path.patch28
-rw-r--r--ports/aws-c-common/portfile.cmake15
5 files changed, 71 insertions, 45 deletions
diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
index 908c7e16a..712566e26 100644
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@@ -1,3 +1,4 @@
Source: aws-c-common
-Version: 0.4.1
+Version: 0.4.15
+Homepage: https://github.com/awslabs/aws-c-common
Description: AWS common library for C
diff --git a/ports/aws-c-common/disable-error-4068.patch b/ports/aws-c-common/disable-error-4068.patch
index 60720cd67..89735cc11 100644
--- a/ports/aws-c-common/disable-error-4068.patch
+++ b/ports/aws-c-common/disable-error-4068.patch
@@ -1,15 +1,15 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 263d34e..8c699b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
- target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
- endif()
-
-+if (WIN32)
-+ add_compile_options(/wd4068)
-+endif()
-+
- aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
- target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79c66c3..f6639d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+ #this only gets applied to aws-c-common (not its consumers).
+ target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
++
++if (WIN32)
++ add_compile_options(/wd4068)
++endif()
+
+ aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch
index fccb607cf..cdf24606d 100644
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@@ -1,20 +1,20 @@
-diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 0f597d7..1359b8b 100644
---- a/cmake/AwsCFlags.cmake
-+++ b/cmake/AwsCFlags.cmake
-@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
- # /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
- # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
- list(APPEND AWS_C_FLAGS /volatile:iso)
--
-- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
-- if(STATIC_CRT)
-- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-- else()
-- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-- endif()
-- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
-- list(APPEND AWS_C_FLAGS "${_FLAGS}")
-
- else()
- list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 42d146e..813f56d 100644
+--- a/cmake/AwsCFlags.cmake
++++ b/cmake/AwsCFlags.cmake
+@@ -39,15 +39,6 @@ function(aws_set_common_properties target)
+ # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
+ list(APPEND AWS_C_FLAGS /volatile:iso)
+
+- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+- if(STATIC_CRT)
+- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+- else()
+- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+- endif()
+- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+- list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+ else()
+ list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+
diff --git a/ports/aws-c-common/fix-cmake-target-path.patch b/ports/aws-c-common/fix-cmake-target-path.patch
new file mode 100644
index 000000000..d2b5df81d
--- /dev/null
+++ b/ports/aws-c-common/fix-cmake-target-path.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 433b6c5..41874a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -209,7 +209,7 @@ else()
+ endif()
+
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
++ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+ NAMESPACE AWS::
+ COMPONENT Development)
+
+diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
+index c322b52..6e5daa0 100644
+--- a/cmake/aws-c-common-config.cmake
++++ b/cmake/aws-c-common-config.cmake
+@@ -1,9 +1,5 @@
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+
+-if (BUILD_SHARED_LIBS)
+- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index eed8e1d56..f9881d125 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -1,14 +1,13 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
- REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
- SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
+ REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
+ SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023
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
)
vcpkg_configure_cmake(
@@ -29,9 +28,7 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright)
+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)