[gentoo-commits] repo/gentoo:master commit in: dev-libs/aws-sdk-cpp/, dev-libs/aws-sdk-cpp/files/

[Joonas Niilola]

commit:     d37df88ee5b07c4286698a8332f1893066a75217
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Tue Sep 29 08:53:02 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 07:06:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37df88e

dev-libs/aws-sdk-cpp: Fix dependency and build FLAGS

* The dependency on dev-libs/aws-checkums has been fixed
* The build system introduces -Werror into the build system, which
  has been removed.

Closes: https://bugs.gentoo.org/745087
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Closes: https://github.com/gentoo/gentoo/pull/17707
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...8.46-r1.ebuild => aws-sdk-cpp-1.8.46-r2.ebuild} |  3 ++-
 ...s-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch | 30 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r1.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
similarity index 98%
rename from dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r1.ebuild
rename to dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
index d2d2b9d0106..a2d30d7fccd 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r1.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
@@ -37,8 +37,8 @@ DEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
-	dev-libs/aws-checksums
 	>=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
 	sys-libs/zlib
 "
 RDEPEND="
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
 )
 
 src_configure() {

diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
new file mode 100644
index 00000000000..9c8ff79e311
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
@@ -0,0 +1,30 @@
+--- a/cmake/compiler_settings.cmake	2020-09-29 10:15:14.293703615 +0200
++++ b/cmake/compiler_settings.cmake	2020-09-29 10:15:32.173704251 +0200
+@@ -53,7 +53,7 @@
+ endmacro()
+ 
+ macro(set_gcc_warnings)
+-    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
++    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
+     if(COMPILER_CLANG)
+         if(PLATFORM_ANDROID)
+             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
+--- a/cspell.json	2020-09-29 10:19:23.102712472 +0200
++++ b/cspell.json	2020-09-29 10:20:32.195714931 +0200
+@@ -11,7 +11,7 @@
+         // CMake
+         "cmake",
+         // Compiler and linker
+-        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused",
++        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused",
+         // Android NDK
+         "JNIEXPORT", "jint", "JNICALL", "jobject", "jclass", "jmethod", "Ljava",
+         // XML parser
+--- a/CI/install-test/CMakeLists.txt	2020-09-29 10:19:32.094712792 +0200
++++ b/CI/install-test/CMakeLists.txt	2020-09-29 10:19:46.064713289 +0200
+@@ -4,4 +4,4 @@
+ find_package(AWSSDK REQUIRED COMPONENTS s3)
+ add_executable(${PROJECT_NAME} "main.cpp")
+ target_link_libraries(${PROJECT_NAME} ${AWSSDK_LINK_LIBRARIES})
+-target_compile_options(${PROJECT_NAME} PRIVATE "-Wall" "-Werror")
++target_compile_options(${PROJECT_NAME} PRIVATE "-Wall")