| 1 |
commit: af5cbae5cf6d46de63c25e7d0fdf03b2fb1fc402 |
| 2 |
Author: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 3 08:51:03 2022 +0000 |
| 4 |
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 3 08:52:11 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5cbae5 |
| 7 |
|
| 8 |
dev-libs/cereal: include system rapidjson |
| 9 |
|
| 10 |
Fixes build and tests. Also fix tests on nomultilib systems by |
| 11 |
disabling one of them. |
| 12 |
|
| 13 |
rapidxml still needs to be unbundled. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/835614 |
| 16 |
Bug: https://bugs.gentoo.org/792444 |
| 17 |
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-libs/cereal/{cereal-1.3.2-r1.ebuild => cereal-1.3.2-r2.ebuild} | 6 ++++++ |
| 20 |
1 file changed, 6 insertions(+) |
| 21 |
|
| 22 |
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild |
| 23 |
similarity index 82% |
| 24 |
rename from dev-libs/cereal/cereal-1.3.2-r1.ebuild |
| 25 |
rename to dev-libs/cereal/cereal-1.3.2-r2.ebuild |
| 26 |
index b32d8e3ca1c7..6082cdb4afaa 100644 |
| 27 |
--- a/dev-libs/cereal/cereal-1.3.2-r1.ebuild |
| 28 |
+++ b/dev-libs/cereal/cereal-1.3.2-r2.ebuild |
| 29 |
@@ -25,6 +25,9 @@ src_prepare() { |
| 30 |
|
| 31 |
# remove bundled rapidjson |
| 32 |
rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson' |
| 33 |
+ sed -e '/rapidjson/s|cereal/external/||' \ |
| 34 |
+ -e 's/CEREAL_RAPIDJSON_NAMESPACE/rapidjson/g' \ |
| 35 |
+ -i include/cereal/archives/json.hpp || die |
| 36 |
|
| 37 |
cmake_src_prepare |
| 38 |
} |
| 39 |
@@ -39,6 +42,9 @@ src_configure() { |
| 40 |
-DSKIP_PERFORMANCE_COMPARISON=ON |
| 41 |
|
| 42 |
-DWITH_WERROR=OFF |
| 43 |
+ |
| 44 |
+ # TODO: Enable if multilib? |
| 45 |
+ -DSKIP_PORTABILITY_TEST=ON |
| 46 |
) |
| 47 |
|
| 48 |
cmake_src_configure |
Archives