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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 839A415808B for ; Sun, 3 Apr 2022 08:52:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0393E0802; Sun, 3 Apr 2022 08:52:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3019E0802 for ; Sun, 3 Apr 2022 08:52:36 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C6B7341464 for ; Sun, 3 Apr 2022 08:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA4E0D0 for ; Sun, 3 Apr 2022 08:52:33 +0000 (UTC) From: "Matthew Smith" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" Message-ID: <1648975931.af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cereal/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/cereal/cereal-1.3.2-r1.ebuild dev-libs/cereal/cereal-1.3.2-r2.ebuild X-VCS-Directories: dev-libs/cereal/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402 X-VCS-Branch: master Date: Sun, 3 Apr 2022 08:52:33 +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: 3a45594a-814a-41d4-99da-65fe90dafa72 X-Archives-Hash: 64460b08e048b132ad2fb6eab7754726 commit: af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402 Author: Matthew Smith gentoo org> AuthorDate: Sun Apr 3 08:51:03 2022 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Apr 3 08:52:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5cbae5 dev-libs/cereal: include system rapidjson Fixes build and tests. Also fix tests on nomultilib systems by disabling one of them. rapidxml still needs to be unbundled. Closes: https://bugs.gentoo.org/835614 Bug: https://bugs.gentoo.org/792444 Signed-off-by: Matthew Smith gentoo.org> dev-libs/cereal/{cereal-1.3.2-r1.ebuild => cereal-1.3.2-r2.ebuild} | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild similarity index 82% rename from dev-libs/cereal/cereal-1.3.2-r1.ebuild rename to dev-libs/cereal/cereal-1.3.2-r2.ebuild index b32d8e3ca1c7..6082cdb4afaa 100644 --- a/dev-libs/cereal/cereal-1.3.2-r1.ebuild +++ b/dev-libs/cereal/cereal-1.3.2-r2.ebuild @@ -25,6 +25,9 @@ src_prepare() { # remove bundled rapidjson rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson' + sed -e '/rapidjson/s|cereal/external/||' \ + -e 's/CEREAL_RAPIDJSON_NAMESPACE/rapidjson/g' \ + -i include/cereal/archives/json.hpp || die cmake_src_prepare } @@ -39,6 +42,9 @@ src_configure() { -DSKIP_PERFORMANCE_COMPARISON=ON -DWITH_WERROR=OFF + + # TODO: Enable if multilib? + -DSKIP_PORTABILITY_TEST=ON ) cmake_src_configure