Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aws-c-common]Upgrade version to 0.3.11 #6747

Merged
merged 3 commits into from
Jun 11, 2019
Merged

[aws-c-common]Upgrade version to 0.3.11 #6747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5713b64
[aws-c-common]Upgrade version to 0.3.11
Jun 4, 2019
2ebc709
[aws-c-common]Fix dependency port build error.
Jun 5, 2019
d3cf830
[aws-c-common]Disable internal crt option because vcpkg contains crt …
Jun 6, 2019
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
2 changes: 1 addition & 1 deletion ports/aws-c-common/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: aws-c-common
Version: 0.3.0
Version: 0.3.11
Description: AWS common library for C
20 changes: 20 additions & 0 deletions ports/aws-c-common/disable-internal-crt-option.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
index 5ceb11c..9d0aa12 100644
--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
# Disable unknown pragma warnings
list(APPEND AWS_C_FLAGS /wd4068)

- 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)

13 changes: 13 additions & 0 deletions ports/aws-c-common/fix-dependencey-build-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h
index 545b06d..c579c82 100644
--- a/include/aws/common/byte_buf.h
+++ b/include/aws/common/byte_buf.h
@@ -21,6 +21,8 @@

#include <string.h>

+#pragma warning(disable: 4068)
+
/**
* Represents a length-delimited binary string or buffer. If byte buffer points
* to constant memory or memory that should otherwise not be freed by this
7 changes: 5 additions & 2 deletions ports/aws-c-common/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
REF v0.3.0
SHA512 604b4289f19be662f15dc5ba80c20b78856975332b485796f979580e45f8d778eb8ce0cc2c02dcbaf27bc1159f473e02676cd951b674b7c8478ed26438a04541
REF v0.3.11
SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750
HEAD_REF master
PATCHES
fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
)

vcpkg_configure_cmake(
Expand Down