diff options
| author |   Matthew Smith <matthew@gentoo.org> | 2022-04-03 09:51:03 +0100 |
|---|---|---|
| committer | Matthew Smith <matthew@gentoo.org> | 2022-04-03 09:52:11 +0100 |
| commit | af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402 (patch) | |
| tree | b1197119301c9a38badb950c081a3a3dea35b62e /dev-libs/cereal | |
| parent | app-backup/bacula: drop 9.6.5, 9.6.6, 9.6.7, 11.0.2, 11.0.3 (diff) | |
| download | gentoo-af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402.tar.gz gentoo-af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402.tar.bz2 gentoo-af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-libs/cereal')
| -rw-r--r-- | dev-libs/cereal/cereal-1.3.2-r2.ebuild (renamed from dev-libs/cereal/cereal-1.3.2-r1.ebuild) | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/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 |