pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases/mongodb3
Module Name: pkgsrc
Committed By: tnn
Date: Thu Feb 2 14:40:33 UTC 2023
Modified Files:
pkgsrc/databases/mongodb3: distinfo
Added Files:
pkgsrc/databases/mongodb3/patches: patch-src_third__party_s2_hash.h
patch-src_third__party_s2_s2__test.cc
patch-src_third__party_s2_s2loop.cc
patch-src_third__party_s2_s2polygon.cc
patch-src_third__party_s2_s2polygonbuilder.cc
patch-src_third__party_s2_s2polygonbuilder.h
patch-src_third__party_s2_s2regioncoverer.cc
patch-src_third__party_s2_strings_split.cc
patch-src_third__party_s2_strings_split.h
Log Message:
mongodb3: fix build failure, probably introduced by boost update
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mongodb3/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_hash.h \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2__test.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2loop.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygon.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.h \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2regioncoverer.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.cc \
pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/mongodb3/distinfo
diff -u pkgsrc/databases/mongodb3/distinfo:1.13 pkgsrc/databases/mongodb3/distinfo:1.14
--- pkgsrc/databases/mongodb3/distinfo:1.13 Tue Oct 26 10:09:24 2021
+++ pkgsrc/databases/mongodb3/distinfo Thu Feb 2 14:40:33 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:09:24 nia Exp $
+$NetBSD: distinfo,v 1.14 2023/02/02 14:40:33 tnn Exp $
BLAKE2s (mongodb-src-r3.4.24.tar.gz) = 157cc185a10426e31470a7fd97922bdc13ea9d19e85e98b5fcc0075e997d1e9a
SHA512 (mongodb-src-r3.4.24.tar.gz) = c19d5215f514ad0c1bd33f17f9d79198e07657260c0a8399c9a84bbf274ec4f6e61a94b36bb132e93a46e96ee8b4d994a1bed70b2d26f906ffe8e78343394226
@@ -26,5 +26,14 @@ SHA1 (patch-src_third__party_asio-master
SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
+SHA1 (patch-src_third__party_s2_hash.h) = 03af36af9082d6a39f27250914e6eb92d9c1fff8
+SHA1 (patch-src_third__party_s2_s2__test.cc) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-src_third__party_s2_s2loop.cc) = b3f8c10ee99897f521562ea0f9c3a239b52d1922
+SHA1 (patch-src_third__party_s2_s2polygon.cc) = 0610c9b502ffd1b2e8887a69ea513b9cf396b640
+SHA1 (patch-src_third__party_s2_s2polygonbuilder.cc) = 8c4a98dbcaa941e5bb4146a654465c50ce993770
+SHA1 (patch-src_third__party_s2_s2polygonbuilder.h) = c79bbb4abbd73b83829f921c2048b62dec36f3be
+SHA1 (patch-src_third__party_s2_s2regioncoverer.cc) = 419f5691af3eded424e504d95e88422579227579
+SHA1 (patch-src_third__party_s2_strings_split.cc) = 505a784b35469c5821694e3e10805dc263c766b9
+SHA1 (patch-src_third__party_s2_strings_split.h) = de3dcba69f9d9e7de2d4b2f7b6c122249c12a9a4
SHA1 (patch-src_third__party_wiredtiger_SConscript) = f135c502c11a1d33da3a5e4c61db00dba85c27c4
SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = 6da1014613231a0e56dd3449bd5d61014340575a
Added files:
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_hash.h
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_hash.h:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_hash.h Thu Feb 2 14:40:33 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_third__party_s2_hash.h,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/hash.h.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/hash.h
+@@ -2,10 +2,10 @@
+ #define THIRD_PARTY_S2_HASH_H_
+
+ #include <unordered_map>
+-#define hash_map std::unordered_map
++#define s2_hash_map std::unordered_map
+
+ #include <unordered_set>
+-#define hash_set std::unordered_set
++#define s2_hash_set std::unordered_set
+
+ #define HASH_NAMESPACE_START namespace std {
+ #define HASH_NAMESPACE_END }
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2loop.cc
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2loop.cc:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2loop.cc Thu Feb 2 14:40:33 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_third__party_s2_s2loop.cc,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/s2loop.cc.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/s2loop.cc
+@@ -121,7 +121,7 @@ bool S2Loop::IsValid(string* err) const
+ }
+ }
+ // Loops are not allowed to have any duplicate vertices.
+- hash_map<S2Point, int> vmap;
++ s2_hash_map<S2Point, int> vmap;
+ for (int i = 0; i < num_vertices(); ++i) {
+ if (!vmap.insert(make_pair(vertex(i), i)).second) {
+ VLOG(2) << "Duplicate vertices: " << vmap[vertex(i)] << " and " << i;
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygon.cc
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygon.cc:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygon.cc Thu Feb 2 14:40:33 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_third__party_s2_s2polygon.cc,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/s2polygon.cc.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/s2polygon.cc
+@@ -120,7 +120,7 @@ HASH_NAMESPACE_END
+ bool S2Polygon::IsValid(const vector<S2Loop*>& loops, string* err) {
+ // If a loop contains an edge AB, then no other loop may contain AB or BA.
+ if (loops.size() > 1) {
+- hash_map<S2PointPair, pair<int, int> > edges;
++ s2_hash_map<S2PointPair, pair<int, int> > edges;
+ for (size_t i = 0; i < loops.size(); ++i) {
+ S2Loop* lp = loops[i];
+ for (int j = 0; j < lp->num_vertices(); ++j) {
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.cc
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.cc:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.cc Thu Feb 2 14:40:33 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_third__party_s2_s2polygonbuilder.cc,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/s2polygonbuilder.cc.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/s2polygonbuilder.cc
+@@ -175,7 +175,7 @@ S2Loop* S2PolygonBuilder::AssembleLoop(S
+ // This ensures that only CCW loops are constructed when possible.
+
+ vector<S2Point> path; // The path so far.
+- hash_map<S2Point, int> index; // Maps a vertex to its index in "path".
++ s2_hash_map<S2Point, int> index; // Maps a vertex to its index in "path".
+ path.push_back(v0);
+ path.push_back(v1);
+ index[v1] = 1;
+@@ -361,7 +361,7 @@ void S2PolygonBuilder::BuildMergeMap(Poi
+
+ // First, we build the set of all the distinct vertices in the input.
+ // We need to include the source and destination of every edge.
+- hash_set<S2Point> vertices;
++ s2_hash_set<S2Point> vertices;
+ for (EdgeSet::const_iterator i = edges_->begin(); i != edges_->end(); ++i) {
+ vertices.insert(i->first);
+ VertexSet const& vset = i->second;
+@@ -370,7 +370,7 @@ void S2PolygonBuilder::BuildMergeMap(Poi
+ }
+
+ // Build a spatial index containing all the distinct vertices.
+- for (hash_set<S2Point>::const_iterator i = vertices.begin();
++ for (s2_hash_set<S2Point>::const_iterator i = vertices.begin();
+ i != vertices.end(); ++i) {
+ index->Insert(*i);
+ }
+@@ -378,7 +378,7 @@ void S2PolygonBuilder::BuildMergeMap(Poi
+ // Next, we loop through all the vertices and attempt to grow a maximial
+ // mergeable group starting from each vertex.
+ vector<S2Point> frontier, mergeable;
+- for (hash_set<S2Point>::const_iterator vstart = vertices.begin();
++ for (s2_hash_set<S2Point>::const_iterator vstart = vertices.begin();
+ vstart != vertices.end(); ++vstart) {
+ // Skip any vertices that have already been merged with another vertex.
+ if (merge_map->find(*vstart) != merge_map->end()) continue;
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.h
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.h:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2polygonbuilder.h Thu Feb 2 14:40:33 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_third__party_s2_s2polygonbuilder.h,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/s2polygonbuilder.h.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/s2polygonbuilder.h
+@@ -262,7 +262,7 @@ class S2PolygonBuilder {
+ // current position to a new position, and also returns a spatial index
+ // containing all of the vertices that do not need to be moved.
+ class PointIndex;
+- typedef hash_map<S2Point, S2Point> MergeMap;
++ typedef s2_hash_map<S2Point, S2Point> MergeMap;
+ void BuildMergeMap(PointIndex* index, MergeMap* merge_map);
+
+ // Moves a set of vertices from old to new positions.
+@@ -282,7 +282,7 @@ class S2PolygonBuilder {
+ // once. We could have also used a multiset<pair<S2Point, S2Point> >,
+ // but this representation is a bit more convenient.
+ typedef multiset<S2Point> VertexSet;
+- typedef hash_map<S2Point, VertexSet> EdgeSet;
++ typedef s2_hash_map<S2Point, VertexSet> EdgeSet;
+ scoped_ptr<EdgeSet> edges_;
+
+ // Unique collection of the starting (first) vertex of all edges,
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2regioncoverer.cc
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2regioncoverer.cc:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_s2regioncoverer.cc Thu Feb 2 14:40:33 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_third__party_s2_s2regioncoverer.cc,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/s2regioncoverer.cc.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/s2regioncoverer.cc
+@@ -321,7 +321,7 @@ void S2RegionCoverer::GetInteriorCellUni
+
+ void S2RegionCoverer::FloodFill(
+ S2Region const& region, S2CellId const& start, vector<S2CellId>* output) {
+- hash_set<S2CellId> all;
++ s2_hash_set<S2CellId> all;
+ vector<S2CellId> frontier;
+ output->clear();
+ all.insert(start);
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.cc
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.cc:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.cc Thu Feb 2 14:40:33 2023
@@ -0,0 +1,55 @@
+$NetBSD: patch-src_third__party_s2_strings_split.cc,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/strings/split.cc.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/strings/split.cc
+@@ -156,7 +156,7 @@ struct simple_insert_iterator {
+ // SplitStringToIterator{Using|AllowEmpty}().
+ template <typename T>
+ struct simple_hash_map_iterator {
+- typedef hash_map<T, T> hashmap;
++ typedef s2_hash_map<T, T> hashmap;
+ hashmap* t;
+ bool even;
+ typename hashmap::iterator curr;
+@@ -246,8 +246,8 @@ void SplitStringAllowEmpty(const string&
+ }
+
+ void SplitStringToHashsetAllowEmpty(const string& full, const char* delim,
+- hash_set<string>* result) {
+- simple_insert_iterator<hash_set<string> > it(result);
++ s2_hash_set<string>* result) {
++ simple_insert_iterator<s2_hash_set<string> > it(result);
+ SplitStringToIteratorAllowEmpty(full, delim, 0, it);
+ }
+
+@@ -258,7 +258,7 @@ void SplitStringToSetAllowEmpty(const st
+ }
+
+ void SplitStringToHashmapAllowEmpty(const string& full, const char* delim,
+- hash_map<string, string>* result) {
++ s2_hash_map<string, string>* result) {
+ simple_hash_map_iterator<string> it(result);
+ SplitStringToIteratorAllowEmpty(full, delim, 0, it);
+ }
+@@ -352,8 +352,8 @@ void SplitStringUsing(const string& full
+ }
+
+ void SplitStringToHashsetUsing(const string& full, const char* delim,
+- hash_set<string>* result) {
+- simple_insert_iterator<hash_set<string> > it(result);
++ s2_hash_set<string>* result) {
++ simple_insert_iterator<s2_hash_set<string> > it(result);
+ SplitStringToIteratorUsing(full, delim, it);
+ }
+
+@@ -364,7 +364,7 @@ void SplitStringToSetUsing(const string&
+ }
+
+ void SplitStringToHashmapUsing(const string& full, const char* delim,
+- hash_map<string, string>* result) {
++ s2_hash_map<string, string>* result) {
+ simple_hash_map_iterator<string> it(result);
+ SplitStringToIteratorUsing(full, delim, it);
+ }
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.h
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.h:1.1
--- /dev/null Thu Feb 2 14:40:33 2023
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_s2_strings_split.h Thu Feb 2 14:40:33 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_third__party_s2_strings_split.h,v 1.1 2023/02/02 14:40:33 tnn Exp $
+
+Deal with namespace conflict.
+
+--- src/third_party/s2/strings/split.h.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/s2/strings/split.h
+@@ -41,7 +41,7 @@ using namespace std;
+ void SplitStringAllowEmpty(const string& full, const char* delim,
+ vector<string>* res);
+ void SplitStringToHashsetAllowEmpty(const string& full, const char* delim,
+- hash_set<string>* res);
++ s2_hash_set<string>* res);
+ void SplitStringToSetAllowEmpty(const string& full, const char* delim,
+ set<string>* res);
+ // The even-positioned (0-based) components become the keys for the
+@@ -50,7 +50,7 @@ void SplitStringToSetAllowEmpty(const st
+ // if the key was already present in the hash table, or will be the
+ // empty string if the key is a newly inserted key.
+ void SplitStringToHashmapAllowEmpty(const string& full, const char* delim,
+- hash_map<string, string>* result);
++ s2_hash_map<string, string>* result);
+
+ // ----------------------------------------------------------------------
+ // SplitStringUsing()
+@@ -66,7 +66,7 @@ void SplitStringToHashmapAllowEmpty(cons
+ void SplitStringUsing(const string& full, const char* delim,
+ vector<string>* res);
+ void SplitStringToHashsetUsing(const string& full, const char* delim,
+- hash_set<string>* res);
++ s2_hash_set<string>* res);
+ void SplitStringToSetUsing(const string& full, const char* delim,
+ set<string>* res);
+ // The even-positioned (0-based) components become the keys for the
+@@ -75,7 +75,7 @@ void SplitStringToSetUsing(const string&
+ // if the key was already present in the hash table, or will be the
+ // empty string if the key is a newly inserted key.
+ void SplitStringToHashmapUsing(const string& full, const char* delim,
+- hash_map<string, string>* result);
++ s2_hash_map<string, string>* result);
+
+ // ----------------------------------------------------------------------
+ // SplitOneIntToken()
Home |
Main Index |
Thread Index |
Old Index