[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/

[Craig Andrews]

commit:     a6485336b09976be119a81315a717e3bced97378
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 21:57:15 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 21:57:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6485336

dev-libs/rapidjson: Fix USE=examples with >=gcc-8

Closes: https://bugs.gentoo.org/673698
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild |  7 +++++++
 dev-libs/rapidjson/rapidjson-9999.ebuild     | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
index 3566ee541f7..69293ade501 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
@@ -33,6 +33,13 @@ PATCHES=(
 	"${FILESDIR}/${P}-gcc-7.patch"
 )
 
+src_prepare() {
+	default
+
+	sed -i -e 's|-Werror||g' CMakeLists.txt || die
+	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DRAPIDJSON_BUILD_DOC=$(usex doc)

diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 6d3ed3621f8..8bd5504560c 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,17 @@ DEPEND="
 	)"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-7.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-Werror||g' CMakeLists.txt || die
+	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DRAPIDJSON_BUILD_DOC=$(usex doc)