1 |
commit: 71cd057da9e59309b6deed3919c7815022587e1d |
2 |
Author: James Beddek <telans <AT> posteo <DOT> de> |
3 |
AuthorDate: Sun Oct 10 23:43:35 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 11 00:00:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd057d |
7 |
|
8 |
app-arch/snappy: disable -Werror with Clang |
9 |
|
10 |
Signed-off-by: James Beddek <telans <AT> posteo.de> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/22550 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
app-arch/snappy/files/snappy-1.1.9-clang-werror.patch | 16 ++++++++++++++++ |
15 |
app-arch/snappy/snappy-1.1.9.ebuild | 1 + |
16 |
2 files changed, 17 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..e89a8305e73 |
21 |
--- /dev/null |
22 |
+++ b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch |
23 |
@@ -0,0 +1,16 @@ |
24 |
+--- a/CMakeLists.txt |
25 |
++++ b/CMakeLists.txt |
26 |
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") |
27 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra") |
28 |
+ endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra") |
29 |
+ |
30 |
+- # Use -Werror for clang only. |
31 |
+- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
32 |
+- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") |
33 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") |
34 |
+- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") |
35 |
+- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
36 |
+- |
37 |
+ # Disable C++ exceptions. |
38 |
+ string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
39 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") |
40 |
|
41 |
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild |
42 |
index 1d6d63ebf93..85387dbf364 100644 |
43 |
--- a/app-arch/snappy/snappy-1.1.9.ebuild |
44 |
+++ b/app-arch/snappy/snappy-1.1.9.ebuild |
45 |
@@ -23,6 +23,7 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md ) |
46 |
PATCHES=( |
47 |
"${FILESDIR}/${P}_gcc_inline.patch" |
48 |
"${FILESDIR}/${P}_external_gtest.patch" |
49 |
+ "${FILESDIR}/${PN}-1.1.9-clang-werror.patch" |
50 |
) |
51 |
|
52 |
multilib_src_configure() { |