commit:     71cd057da9e59309b6deed3919c7815022587e1d
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 10 23:43:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 00:00:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd057d

app-arch/snappy: disable -Werror with Clang

Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22550
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/snappy/files/snappy-1.1.9-clang-werror.patch | 16 ++++++++++++++++
 app-arch/snappy/snappy-1.1.9.ebuild                   |  1 +
 2 files changed, 17 insertions(+)

diff --git a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch 
b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
new file mode 100644
index 00000000000..e89a8305e73
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+   endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+ 
+-  # Use -Werror for clang only.
+-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-  endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-
+   # Disable C++ exceptions.
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")

diff --git a/app-arch/snappy/snappy-1.1.9.ebuild 
b/app-arch/snappy/snappy-1.1.9.ebuild
index 1d6d63ebf93..85387dbf364 100644
--- a/app-arch/snappy/snappy-1.1.9.ebuild
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -23,6 +23,7 @@ DOCS=( format_description.txt framing_format.txt NEWS 
README.md )
 PATCHES=(
        "${FILESDIR}/${P}_gcc_inline.patch"
        "${FILESDIR}/${P}_external_gtest.patch"
+       "${FILESDIR}/${PN}-1.1.9-clang-werror.patch"
 )
 
 multilib_src_configure() {

Reply via email to