pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cereal: Fix build on non-x86 platforms.



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sun Aug 9 12:01:37 2026 +1000
Changeset:	77b8e13d90fce5729d8722c40238cf72563e1b0b

Modified Files:
	cereal/distinfo
Added Files:
	cereal/patches/patch-unittests_map.hpp
	cereal/patches/patch-unittests_multimap.hpp
	cereal/patches/patch-unittests_unordered__map.hpp
	cereal/patches/patch-unittests_unordered__multimap.hpp

Log Message:
cereal: Fix build on non-x86 platforms.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=77b8e13d90fce5729d8722c40238cf72563e1b0b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cereal/distinfo                                        |  4 ++++
 cereal/patches/patch-unittests_map.hpp                 | 16 ++++++++++++++++
 cereal/patches/patch-unittests_multimap.hpp            | 16 ++++++++++++++++
 cereal/patches/patch-unittests_unordered__map.hpp      | 16 ++++++++++++++++
 cereal/patches/patch-unittests_unordered__multimap.hpp | 16 ++++++++++++++++
 5 files changed, 68 insertions(+)

diffs:
diff --git a/cereal/distinfo b/cereal/distinfo
index 2414a22878..1de76a4151 100644
--- a/cereal/distinfo
+++ b/cereal/distinfo
@@ -4,3 +4,7 @@ BLAKE2s (cereal-1.3.2.tar.gz) = b472b709d55dc8d2714a0c7b3eeb5c531b6fa3f26750cda3
 SHA512 (cereal-1.3.2.tar.gz) = 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109
 Size (cereal-1.3.2.tar.gz) = 385903 bytes
 SHA1 (patch-CMakeLists.txt) = f1b0cbae35a117b3cab41ecc75de34efdf86d2be
+SHA1 (patch-unittests_map.hpp) = 59cbfe5f77a629283917d69b09ba47d298ad0566
+SHA1 (patch-unittests_multimap.hpp) = 82f4219427ca2909623567e1b9d5d4c8f1a6e73b
+SHA1 (patch-unittests_unordered__map.hpp) = c1c5e859f8d27ac102e4b26d784490487d3ff91f
+SHA1 (patch-unittests_unordered__multimap.hpp) = 4a828b50b77312bf26c167a5aeaa96ac5a65af40
diff --git a/cereal/patches/patch-unittests_map.hpp b/cereal/patches/patch-unittests_map.hpp
new file mode 100644
index 0000000000..6c7dbeffe6
--- /dev/null
+++ b/cereal/patches/patch-unittests_map.hpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid char which is ambiguous, and may be signed or unsigned.
+https://github.com/USCiLab/cereal/commit/2c647d87d492bea4400e95cf71c2de7270e2f3ab
+
+--- unittests/map.hpp.orig	2026-08-09 01:35:51.369193037 +0000
++++ unittests/map.hpp
+@@ -62,7 +62,7 @@ void test_map()
+ 
+     std::map<int8_t, StructExternalSplit> o_esplmap;
+     for(int j=0; j<100; ++j)
+-      o_esplmap.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
++      o_esplmap.insert({random_value<int8_t>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
+ 
+     std::ostringstream os;
+     {
diff --git a/cereal/patches/patch-unittests_multimap.hpp b/cereal/patches/patch-unittests_multimap.hpp
new file mode 100644
index 0000000000..7e5f2e5f8f
--- /dev/null
+++ b/cereal/patches/patch-unittests_multimap.hpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid char which is ambiguous, and may be signed or unsigned.
+https://github.com/USCiLab/cereal/commit/2c647d87d492bea4400e95cf71c2de7270e2f3ab
+
+--- unittests/multimap.hpp.orig	2026-08-09 01:40:56.618204637 +0000
++++ unittests/multimap.hpp
+@@ -71,7 +71,7 @@ void test_multimap()
+     std::multimap<int8_t, StructExternalSplit> o_esplmultimap;
+     for(int j=0; j<100; ++j)
+     {
+-      auto key = random_value<char>(gen);
++      auto key = random_value<int8_t>(gen);
+       o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+       o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+     }
diff --git a/cereal/patches/patch-unittests_unordered__map.hpp b/cereal/patches/patch-unittests_unordered__map.hpp
new file mode 100644
index 0000000000..a4ced397bc
--- /dev/null
+++ b/cereal/patches/patch-unittests_unordered__map.hpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid char which is ambiguous, and may be signed or unsigned.
+https://github.com/USCiLab/cereal/commit/2c647d87d492bea4400e95cf71c2de7270e2f3ab
+
+--- unittests/unordered_map.hpp.orig	2026-08-09 01:42:43.700552774 +0000
++++ unittests/unordered_map.hpp
+@@ -54,7 +54,7 @@ void test_unordered_map()
+ 
+     std::unordered_map<int8_t, StructExternalSplit> o_esplunordered_map;
+     for(int j=0; j<100; ++j)
+-      o_esplunordered_map.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
++      o_esplunordered_map.insert({random_value<int8_t>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
+ 
+     std::ostringstream os;
+     {
diff --git a/cereal/patches/patch-unittests_unordered__multimap.hpp b/cereal/patches/patch-unittests_unordered__multimap.hpp
new file mode 100644
index 0000000000..36692c974f
--- /dev/null
+++ b/cereal/patches/patch-unittests_unordered__multimap.hpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid char which is ambiguous, and may be signed or unsigned.
+https://github.com/USCiLab/cereal/commit/2c647d87d492bea4400e95cf71c2de7270e2f3ab
+
+--- unittests/unordered_multimap.hpp.orig	2026-08-09 01:43:34.764028570 +0000
++++ unittests/unordered_multimap.hpp
+@@ -71,7 +71,7 @@ void test_unordered_multimap()
+     std::unordered_multimap<int8_t, StructExternalSplit> o_esplunordered_multimap;
+     for(int j=0; j<100; ++j)
+     {
+-      auto key = random_value<char>(gen);
++      auto key = random_value<int8_t>(gen);
+       o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+       o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+     }


Home | Main Index | Thread Index | Old Index