[gentoo-commits] repo/proj/guru:master commit in: dev-libs/boringssl-fips/, dev-libs/boringssl-fips/files/

[gentoo-commits] repo/proj/guru:master commit in: dev-libs/boringssl-fips/, dev-libs/boringssl-fips/files/

[Florian Schmaus]

commit:     9034dea4f331bed97e83c59c13540aa4a0fcd938
Author:     Okamura Kazuya <gentoo-guru <AT> danceylove <DOT> net>
AuthorDate: Sun Jul  2 12:06:25 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 12:06:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9034dea4

dev-libs/boringssl-fips: Remove flag -Werror

Signed-off-by: Okamura Kazuya <gentoo-guru <AT> danceylove.net>

 .../boringssl-fips/boringssl-fips-20230428.ebuild  |  1 +
 .../files/boringssl-fips-remove-Werror.patch       | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild b/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild
index 13fac1a4f..13dc204b3 100644
--- a/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild
+++ b/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild
@@ -22,6 +22,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/fix-${PN}-collisions-openssl.patch
+	"${FILESDIR}"/${PN}-remove-Werror.patch
 )
 
 src_configure() {

diff --git a/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch b/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch
new file mode 100644
index 000000000..c8f839345
--- /dev/null
+++ b/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch
@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -139,7 +139,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
+ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+   # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
+   # primarily on our normal Clang one.
+-  set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
++  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
+   if(MSVC)
+     # clang-cl sets different default warnings than clang. It also treats -Wall
+     # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
+--- a/third_party/googletest/cmake/internal_utils.cmake
++++ b/third_party/googletest/cmake/internal_utils.cmake
+@@ -82,13 +82,13 @@ macro(config_compiler_and_linker)
+     # http://stackoverflow.com/questions/3232669 explains the issue.
+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
+     set(cxx_exception_flags "-fexceptions")
+     set(cxx_no_exception_flags "-fno-exceptions")
+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
+     set(cxx_no_rtti_flags "-fno-rtti")
+   elseif (CMAKE_COMPILER_IS_GNUCXX)
+-    set(cxx_base_flags "-Wall -Wshadow -Werror")
++    set(cxx_base_flags "-Wall -Wshadow")
+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
+       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
+     endif()
+--- a/util/BUILD.toplevel
++++ b/util/BUILD.toplevel
+@@ -78,7 +78,6 @@ gcc_copts = [
+ 
+     # This list of warnings should match those in the top-level CMakeLists.txt.
+     "-Wall",
+-    "-Werror",
+     "-Wformat=2",
+     "-Wsign-compare",
+     "-Wmissing-field-initializers",