commit: af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402 Author: Matthew Smith <matthew <AT> gentoo <DOT> org> AuthorDate: Sun Apr 3 08:51:03 2022 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> 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 <matthew <AT> 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
