From ce652c966c9ea963cee537065d508c2dc98c0e1e Mon Sep 17 00:00:00 2001 From: Jaco Kroon Date: Fri, 24 Jul 2026 00:02:14 +0200 Subject: [PATCH] dev-cpp/aws-crt-cpp: 0.37.4-r2 Closes: https://bugs.gentoo.org/979707 Closes: https://bugs.gentoo.org/979694 Signed-off-by: Jaco Kroon --- ...r1.ebuild => aws-crt-cpp-0.37.4-r2.ebuild} | 11 +++- ...crt-cpp-0.37.4-r2-warnins_are_errors.patch | 59 +++++++++++++++++++ ...ws-crt-cpp-0.37.4-warnins_are_errors.patch | 29 --------- 3 files changed, 69 insertions(+), 30 deletions(-) rename dev-cpp/aws-crt-cpp/{aws-crt-cpp-0.37.4-r1.ebuild => aws-crt-cpp-0.37.4-r2.ebuild} (83%) create mode 100644 dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch delete mode 100644 dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch diff --git a/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r1.ebuild b/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r2.ebuild similarity index 83% rename from dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r1.ebuild rename to dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r2.ebuild index 6d7a63a60e197..1c7bed54636ba 100644 --- a/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r1.ebuild +++ b/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r2.ebuild @@ -31,7 +31,7 @@ RDEPEND="${DEPEND}" BDEPEND="dev-libs/aws-c-common" PATCHES=( - "${FILESDIR}/aws-crt-cpp-0.37.4-warnins_are_errors.patch" + "${FILESDIR}/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch" ) src_configure() @@ -47,3 +47,12 @@ src_configure() cmake_src_configure } + +src_install() +{ + cmake_src_install + + if use test; then + rm -r "${D}/usr/bin" || die "Error removing testbinaries from /usr/bin" + fi +} diff --git a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch new file mode 100644 index 0000000000000..67ce4d11b1dc4 --- /dev/null +++ b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch @@ -0,0 +1,59 @@ +https://github.com/awslabs/aws-crt-cpp/pull/889 +From dc7b4a22c97cb534e12af25034aff81e25b5f1f5 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Thu, 23 Jul 2026 00:46:43 +0200 +Subject: [PATCH] Use AWS_WARNINGS_ARE_ERRORS to restrict -Werror + +This is in some of the sub folders. + +Found by Gentoo tinderbox: https://bugs.gentoo.org/977183 + +Signed-off-by: Jaco Kroon +--- + bin/elasticurl_cpp/CMakeLists.txt | 2 +- + bin/mqtt5_app/CMakeLists.txt | 2 +- + bin/mqtt5_canary/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bin/elasticurl_cpp/CMakeLists.txt b/bin/elasticurl_cpp/CMakeLists.txt +index a96f94e..b0c5482 100644 +--- a/bin/elasticurl_cpp/CMakeLists.txt ++++ b/bin/elasticurl_cpp/CMakeLists.txt +@@ -20,7 +20,7 @@ if (MSVC) + target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE "/MD$<$:d>") + endif() + target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE /W4 /WX) +-else () ++elseif (AWS_WARNINGS_ARE_ERRORS) + target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) + endif () + +diff --git a/bin/mqtt5_app/CMakeLists.txt b/bin/mqtt5_app/CMakeLists.txt +index 931e07e..60358a2 100644 +--- a/bin/mqtt5_app/CMakeLists.txt ++++ b/bin/mqtt5_app/CMakeLists.txt +@@ -20,7 +20,7 @@ if (MSVC) + target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE "/MD$<$:d>") + endif() + target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE /W4 /WX) +-else () ++elseif (AWS_WARNINGS_ARE_ERRORS) + target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) + endif () + +diff --git a/bin/mqtt5_canary/CMakeLists.txt b/bin/mqtt5_canary/CMakeLists.txt +index 4426053..e41ed00 100644 +--- a/bin/mqtt5_canary/CMakeLists.txt ++++ b/bin/mqtt5_canary/CMakeLists.txt +@@ -21,7 +21,7 @@ if (MSVC) + target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE "/MD$<$:d>") + endif() + target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE /W4 /WX) +-else () ++elseif (AWS_WARNINGS_ARE_ERRORS) + target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) + endif () + +-- +2.54.0 + diff --git a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch deleted file mode 100644 index bfd5bf7850398..0000000000000 --- a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d97699793a71880c70f948faa42d2a03913d5ecd Mon Sep 17 00:00:00 2001 -From: Jaco Kroon -Date: Thu, 23 Jul 2026 00:46:43 +0200 -Subject: [PATCH] Use AWS_WARNINGS_ARE_ERRORS to restrict -Werror in - elasticurl_cpp. - -Found by Gentoo tinderbox: https://bugs.gentoo.org/977183 - -Signed-off-by: Jaco Kroon ---- - bin/elasticurl_cpp/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/elasticurl_cpp/CMakeLists.txt b/bin/elasticurl_cpp/CMakeLists.txt -index a96f94e..b0c5482 100644 ---- a/bin/elasticurl_cpp/CMakeLists.txt -+++ b/bin/elasticurl_cpp/CMakeLists.txt -@@ -20,7 +20,7 @@ if (MSVC) - target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE "/MD$<$:d>") - endif() - target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE /W4 /WX) --else () -+elseif (AWS_WARNINGS_ARE_ERRORS) - target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) - endif () - --- -2.54.0 -