From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4E1715800F for ; Wed, 22 Feb 2023 16:16:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5984E07B3; Wed, 22 Feb 2023 16:16:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F907E07B3 for ; Wed, 22 Feb 2023 16:16:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1BF633BF55 for ; Wed, 22 Feb 2023 16:16:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F4E08BA for ; Wed, 22 Feb 2023 16:16:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1677082447.4e41fc8570ce676461d46ffae31a62d97a5f59da.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild dev-libs/rapidjson/rapidjson-9999.ebuild X-VCS-Directories: dev-libs/rapidjson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4e41fc8570ce676461d46ffae31a62d97a5f59da X-VCS-Branch: master Date: Wed, 22 Feb 2023 16:16:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c3584af-a758-4d1b-bbf5-10778fd84758 X-Archives-Hash: a8b089f2a7d428234113a7f4aa01144c commit: 4e41fc8570ce676461d46ffae31a62d97a5f59da Author: Peter Levine gmail com> AuthorDate: Wed Feb 8 03:12:43 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 22 16:14:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e41fc85 dev-libs/rapidjson: don't force C++11 dev-cpp/gtest-1.13.0 now requires building with C++14 or later. Remove -std=c++11 and, if not overridden in CXXFLAGS, use the compiler default. For 9999, explicitly pass RAPIDJSON_BUILD_CXX17=ON, which supports that cmake option. Closes: https://bugs.gentoo.org/893466 Closes: https://github.com/gentoo/gentoo/pull/29479 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild | 3 ++- dev-libs/rapidjson/rapidjson-9999.ebuild | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild index a58044c99310..73b3f54b7a78 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,6 +44,7 @@ src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DRAPIDJSON_BUILD_CXX11=OFF # latest gtest requires C++14 or later -DRAPIDJSON_BUILD_DOC=$(usex doc) -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test) diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index c13c44dc56c8..a003c49ec84e 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,8 @@ src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DRAPIDJSON_BUILD_CXX11=OFF # latest gtest requires C++14 or later + -DRAPIDJSON_BUILD_CXX17=ON -DRAPIDJSON_BUILD_DOC=$(usex doc) -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test)