public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Craig Andrews" <candrews@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/
Date: Thu, 27 Dec 2018 21:57:51 +0000 (UTC)	[thread overview]
Message-ID: <1545947861.a6485336b09976be119a81315a717e3bced97378.candrews@gentoo> (raw)

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)


             reply	other threads:[~2018-12-27 21:57 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-27 21:57 Craig Andrews [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-29  9:44 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/ Arthur Zamarin
2023-11-21 22:36 Andreas Sturmlechner
2023-11-16 17:17 Arthur Zamarin
2023-11-16 17:17 Arthur Zamarin
2023-11-16 17:17 Arthur Zamarin
2023-11-16 17:17 Arthur Zamarin
2023-11-16 16:22 Sam James
2023-11-16 16:22 Sam James
2023-11-16 16:22 Sam James
2023-02-22 16:16 Sam James
2022-12-20 20:43 Andreas Sturmlechner
2022-05-19  5:08 WANG Xuerui
2022-05-17 12:38 Agostino Sarubbo
2022-01-31 20:26 Arthur Zamarin
2022-01-31 18:51 Sam James
2022-01-31  6:44 Sam James
2022-01-31  6:24 Sam James
2022-01-30 22:25 Sam James
2022-01-30 22:25 Sam James
2021-12-13 17:22 Craig Andrews
2021-09-06 21:34 Sam James
2021-09-06 21:34 Sam James
2021-07-27 21:54 Marek Szuba
2021-06-08  7:41 Sam James
2021-02-14 22:06 Andreas Sturmlechner
2021-01-05 14:14 Sergei Trofimovich
2020-07-29 16:22 Sam James
2020-07-28 19:23 Sam James
2020-07-27 20:50 Sam James
2020-07-14 22:39 Sam James
2019-10-08 18:57 Craig Andrews
2019-05-22 13:46 Craig Andrews
2018-12-28 14:48 Craig Andrews
2018-12-13 20:49 Mikle Kolyada
2018-11-27 21:55 Thomas Deutschmann
2017-08-24 21:49 Craig Andrews
2017-04-01 10:21 David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1545947861.a6485336b09976be119a81315a717e3bced97378.candrews@gentoo \
    --to=candrews@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox