From c8ed4ef67dd6544492816229cf089ac2e6c12209 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:34:26 +0100 Subject: [PATCH] [aws-crt-cpp] no werror et al (#28520) --- ports/aws-crt-cpp/no-werror.patch | 16 ++++++++++++++++ ports/aws-crt-cpp/portfile.cmake | 1 + ports/aws-crt-cpp/vcpkg.json | 5 +++-- versions/a-/aws-crt-cpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 ports/aws-crt-cpp/no-werror.patch diff --git a/ports/aws-crt-cpp/no-werror.patch b/ports/aws-crt-cpp/no-werror.patch new file mode 100644 index 0000000000..524815982f --- /dev/null +++ b/ports/aws-crt-cpp/no-werror.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1a7964..7a5b1a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -293,9 +293,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug) + target_compile_definitions(${PROJECT_NAME} PRIVATE "-DDEBUG_BUILD") + #set extra warning flags for debug build + if (MSVC) +- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068) ++ target_compile_options(${PROJECT_NAME} PRIVATE /W4 /wd4068) + else () +- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) ++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic) + endif () + endif () + diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index e80371a621..b710de5ab0 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( PATCHES fix-cmake-target-path.patch fix-ios-build.patch + no-werror.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 02a962c205..7498cdfab1 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "aws-crt-cpp", "version": "0.15.1", - "port-version": 3, - "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", + "port-version": 4, + "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", + "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index fe805028ea..b054032a33 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2247bebb1109b41b4a27e18d2c91812d23dfe55d", + "version": "0.15.1", + "port-version": 4 + }, { "git-tree": "e542ffdad6392c75909a3235d33c2a22c939c980", "version": "0.15.1", diff --git a/versions/baseline.json b/versions/baseline.json index d3e6dbb83b..048e9a55ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -330,7 +330,7 @@ }, "aws-crt-cpp": { "baseline": "0.15.1", - "port-version": 3 + "port-version": 4 }, "aws-lambda-cpp": { "baseline": "0.2.7",