summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Beddek <telans@posteo.de>2021-10-11 12:43:35 +1300
committerSam James <sam@gentoo.org>2021-10-11 01:00:57 +0100
commit71cd057da9e59309b6deed3919c7815022587e1d (patch)
tree37cecb4e79f3de5dd1b392415ce846eee7f4aa0b /app-arch/snappy
parentdev-java/jclasslib: Keyword 3.1 arm, #805890 (diff)
downloadgentoo-71cd057da9e59309b6deed3919c7815022587e1d.tar.gz
gentoo-71cd057da9e59309b6deed3919c7815022587e1d.tar.bz2
gentoo-71cd057da9e59309b6deed3919c7815022587e1d.zip
app-arch/snappy: disable -Werror with Clang
Signed-off-by: James Beddek <telans@posteo.de> Closes: https://github.com/gentoo/gentoo/pull/22550 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch/snappy')
-rw-r--r--app-arch/snappy/files/snappy-1.1.9-clang-werror.patch16
-rw-r--r--app-arch/snappy/snappy-1.1.9.ebuild1
2 files changed, 17 insertions, 0 deletions
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 000000000000..e89a8305e731
--- /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 1d6d63ebf93a..85387dbf3644 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() {