diff options
Diffstat (limited to 'dev-db/mongodb/files')
33 files changed, 0 insertions, 2536 deletions
diff --git a/dev-db/mongodb/files/extrapatch-sconstruct.patch b/dev-db/mongodb/files/extrapatch-sconstruct.patch deleted file mode 100644 index 21c09bc5c9a1..000000000000 --- a/dev-db/mongodb/files/extrapatch-sconstruct.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too - # setting it for both C and C++ by setting both of CFLAGS and - # CXXFLAGS. - -+ arm_march_flag = "armv8-a" -+ if get_option('use-hardware-crc32') == "on": -+ arm_march_flag += "+crc" -+ - default_targeting_flags_for_architecture = { -- "aarch64": {"-march=": "armv8.2-a", "-mtune=": "generic"}, -+ "aarch64": {"-march=": arm_march_flag, "-mtune=": "generic"}, - "i386": {"-march=": "nocona", "-mtune=": "generic"}, - "ppc64le": {"-mcpu=": "power8", "-mtune=": "power8", "-mcmodel=": "medium"}, - "s390x": {"-march=": "z196", "-mtune=": "zEC12"}, diff --git a/dev-db/mongodb/files/mongodb-4.4.1-boost.patch b/dev-db/mongodb/files/mongodb-4.4.1-boost.patch deleted file mode 100644 index d14f6fe3052f..000000000000 --- a/dev-db/mongodb/files/mongodb-4.4.1-boost.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -3511,17 +3511,11 @@ def doConfigure(myenv): - "BOOST_LOG_NO_SHORTHAND_NAMES", - "BOOST_LOG_USE_NATIVE_SYSLOG", - "BOOST_LOG_WITHOUT_THREAD_ATTR", -+ "BOOST_LOG_DYN_LINK", - "ABSL_FORCE_ALIGNED_ACCESS", - ] - ) - -- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': -- conf.env.AppendUnique( -- CPPDEFINES=[ -- "BOOST_LOG_DYN_LINK", -- ] -- ) -- - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): - myenv.ConfError("can't find boost headers") diff --git a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch deleted file mode 100644 index 331f0c5b922a..000000000000 --- a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch +++ /dev/null @@ -1,317 +0,0 @@ -https://bugs.gentoo.org/887037 - -Workaround https://github.com/boostorg/container/commit/99091420ae553b27345e04279fd19fe24fb684c1 -in Boost 1.81. - -Upstream s2 (as in real upstream, not MongoDB) has deviated substantially -from the version vendored. ---- a/src/third_party/s2/base/stl_decl_msvc.h -+++ b/src/third_party/s2/base/stl_decl_msvc.h -@@ -118,8 +118,8 @@ namespace msvchash { - class hash_multimap; - } // end namespace msvchash - --using msvchash::hash_set; --using msvchash::hash_map; -+using msvchash::hash_set = my_hash_set; -+using msvchash::hash_map = my_hash_map; - using msvchash::hash; - using msvchash::hash_multimap; - using msvchash::hash_multiset; ---- a/src/third_party/s2/base/stl_decl_osx.h -+++ b/src/third_party/s2/base/stl_decl_osx.h -@@ -68,8 +68,8 @@ using std::string; - - using namespace std; - using __gnu_cxx::hash; --using __gnu_cxx::hash_set; --using __gnu_cxx::hash_map; -+using __gnu_cxx::hash_set = my_hash_set; -+using __gnu_cxx::hash_map = my_hash_map; - using __gnu_cxx::select1st; - - /* On Linux (and gdrive on OSX), this comes from places like ---- a/src/third_party/s2/hash.h -+++ b/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 my_hash_map std::unordered_map - - #include <unordered_set> --#define hash_set std::unordered_set -+#define my_hash_set std::unordered_set - - #define HASH_NAMESPACE_START namespace std { - #define HASH_NAMESPACE_END } ---- a/src/third_party/s2/s2_test.cc -+++ b/src/third_party/s2/s2_test.cc -@@ -10,7 +10,7 @@ using std::reverse; - - #include <hash_set> - #include <hash_map> --using __gnu_cxx::hash_set; -+using __gnu_cxx::hash_set = my_hash_map; - - #include "s2.h" - #include "base/logging.h" -@@ -709,8 +709,8 @@ TEST(S2, Frames) { - #if 0 - TEST(S2, S2PointHashSpreads) { - int kTestPoints = 1 << 16; -- hash_set<size_t> set; -- hash_set<S2Point> points; -+ my_hash_set<size_t> set; -+ my_hash_set<S2Point> points; - hash<S2Point> hasher; - S2Point base = S2Point(1, 1, 1); - for (int i = 0; i < kTestPoints; ++i) { -@@ -733,7 +733,7 @@ TEST(S2, S2PointHashCollapsesZero) { - double minus_zero = -zero; - EXPECT_NE(*reinterpret_cast<uint64 const*>(&zero), - *reinterpret_cast<uint64 const*>(&minus_zero)); -- hash_map<S2Point, int> map; -+ my_hash_map<S2Point, int> map; - S2Point zero_pt(zero, zero, zero); - S2Point minus_zero_pt(minus_zero, minus_zero, minus_zero); - ---- a/src/third_party/s2/s2cellid_test.cc -+++ b/src/third_party/s2/s2cellid_test.cc -@@ -10,7 +10,7 @@ using std::reverse; - - #include <cstdio> - #include <hash_map> --using __gnu_cxx::hash_map; -+using __gnu_cxx::hash_map = my_hash_map; - - #include <sstream> - #include <vector> -@@ -170,7 +170,7 @@ TEST(S2CellId, Tokens) { - static const int kMaxExpandLevel = 3; - - static void ExpandCell(S2CellId const& parent, vector<S2CellId>* cells, -- hash_map<S2CellId, S2CellId>* parent_map) { -+ my_hash_map<S2CellId, S2CellId>* parent_map) { - cells->push_back(parent); - if (parent.level() == kMaxExpandLevel) return; - int i, j, orientation; -@@ -194,7 +194,7 @@ static void ExpandCell(S2CellId const& parent, vector<S2CellId>* cells, - - TEST(S2CellId, Containment) { - // Test contains() and intersects(). -- hash_map<S2CellId, S2CellId> parent_map; -+ my_hash_map<S2CellId, S2CellId> parent_map; - vector<S2CellId> cells; - for (int face = 0; face < 6; ++face) { - ExpandCell(S2CellId::FromFacePosLevel(face, 0, 0), &cells, &parent_map); ---- a/src/third_party/s2/s2loop.cc -+++ b/src/third_party/s2/s2loop.cc -@@ -120,7 +120,7 @@ bool S2Loop::IsValid(string* err) const { - } - } - // Loops are not allowed to have any duplicate vertices. -- hash_map<S2Point, int> vmap; -+ my_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; ---- a/src/third_party/s2/s2polygon.cc -+++ b/src/third_party/s2/s2polygon.cc -@@ -117,7 +117,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; -+ my_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) { ---- a/src/third_party/s2/s2polygonbuilder.cc -+++ b/src/third_party/s2/s2polygonbuilder.cc -@@ -175,7 +175,7 @@ S2Loop* S2PolygonBuilder::AssembleLoop(S2Point const& v0, S2Point const& v1, - // 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". -+ my_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(PointIndex* index, MergeMap* merge_map) { - - // 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; -+ my_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(PointIndex* index, MergeMap* merge_map) { - } - - // Build a spatial index containing all the distinct vertices. -- for (hash_set<S2Point>::const_iterator i = vertices.begin(); -+ for (my_hash_set<S2Point>::const_iterator i = vertices.begin(); - i != vertices.end(); ++i) { - index->Insert(*i); - } -@@ -378,7 +378,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) { - // 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 (my_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; ---- a/src/third_party/s2/s2polygonbuilder.h -+++ b/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 my_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 my_hash_map<S2Point, VertexSet> EdgeSet; - scoped_ptr<EdgeSet> edges_; - - // Unique collection of the starting (first) vertex of all edges, ---- a/src/third_party/s2/s2regioncoverer.cc -+++ b/src/third_party/s2/s2regioncoverer.cc -@@ -321,7 +321,7 @@ void S2RegionCoverer::GetInteriorCellUnion(S2Region const& region, - - void S2RegionCoverer::FloodFill( - S2Region const& region, S2CellId const& start, vector<S2CellId>* output) { -- hash_set<S2CellId> all; -+ my_hash_set<S2CellId> all; - vector<S2CellId> frontier; - output->clear(); - all.insert(start); ---- a/src/third_party/s2/s2regioncoverer_test.cc -+++ b/src/third_party/s2/s2regioncoverer_test.cc -@@ -11,7 +11,7 @@ using std::swap; - using std::reverse; - - #include <hash_map> --using __gnu_cxx::hash_map; -+using __gnu_cxx::hash_map = my_hash_map; - - #include <queue> - using std::priority_queue; -@@ -65,7 +65,7 @@ static void CheckCovering(S2RegionCoverer const& coverer, - vector<S2CellId> const& covering, - bool interior) { - // Keep track of how many cells have the same coverer.min_level() ancestor. -- hash_map<S2CellId, int> min_level_cells; -+ my_hash_map<S2CellId, int> min_level_cells; - for (int i = 0; i < covering.size(); ++i) { - int level = covering[i].level(); - EXPECT_GE(level, coverer.min_level()); -@@ -76,7 +76,7 @@ static void CheckCovering(S2RegionCoverer const& coverer, - if (covering.size() > coverer.max_cells()) { - // If the covering has more than the requested number of cells, then check - // that the cell count cannot be reduced by using the parent of some cell. -- for (hash_map<S2CellId, int>::const_iterator i = min_level_cells.begin(); -+ for (my_hash_map<S2CellId, int>::const_iterator i = min_level_cells.begin(); - i != min_level_cells.end(); ++i) { - EXPECT_EQ(i->second, 1); - } ---- a/src/third_party/s2/strings/split.cc -+++ b/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 my_hash_map<T, T> hashmap; - hashmap* t; - bool even; - typename hashmap::iterator curr; -@@ -246,8 +246,8 @@ void SplitStringAllowEmpty(const string& full, const char* delim, - } - - void SplitStringToHashsetAllowEmpty(const string& full, const char* delim, -- hash_set<string>* result) { -- simple_insert_iterator<hash_set<string> > it(result); -+ my_hash_set<string>* result) { -+ simple_insert_iterator<my_hash_set<string> > it(result); - SplitStringToIteratorAllowEmpty(full, delim, 0, it); - } - -@@ -258,7 +258,7 @@ void SplitStringToSetAllowEmpty(const string& full, const char* delim, - } - - void SplitStringToHashmapAllowEmpty(const string& full, const char* delim, -- hash_map<string, string>* result) { -+ my_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); -+ my_hash_set<string>* result) { -+ simple_insert_iterator<my_hash_set<string> > it(result); - SplitStringToIteratorUsing(full, delim, it); - } - -@@ -364,7 +364,7 @@ void SplitStringToSetUsing(const string& full, const char* delim, - } - - void SplitStringToHashmapUsing(const string& full, const char* delim, -- hash_map<string, string>* result) { -+ my_hash_map<string, string>* result) { - simple_hash_map_iterator<string> it(result); - SplitStringToIteratorUsing(full, delim, it); - } ---- a/src/third_party/s2/strings/split.h -+++ b/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); -+ my_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 string& full, const char* delim, - // 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); -+ my_hash_map<string, string>* result); - - // ---------------------------------------------------------------------- - // SplitStringUsing() -@@ -66,7 +66,7 @@ void SplitStringToHashmapAllowEmpty(const string& full, const char* delim, - void SplitStringUsing(const string& full, const char* delim, - vector<string>* res); - void SplitStringToHashsetUsing(const string& full, const char* delim, -- hash_set<string>* res); -+ my_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& full, const char* delim, - // 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); -+ my_hash_map<string, string>* result); - - // ---------------------------------------------------------------------- - // SplitOneIntToken() diff --git a/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch b/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch deleted file mode 100644 index bbcbe34fe6f3..000000000000 --- a/dev-db/mongodb/files/mongodb-4.4.29-no-enterprise.patch +++ /dev/null @@ -1,24 +0,0 @@ - buildscripts/moduleconfig.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py -index b4d0bba0490..03541fab940 100644 ---- a/buildscripts/moduleconfig.py -+++ b/buildscripts/moduleconfig.py -@@ -27,7 +27,6 @@ MongoDB SConscript files do. - __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', - 'register_module_test') # pylint: disable=undefined-all-variable - --import imp - import inspect - import os - -@@ -71,8 +70,6 @@ def discover_modules(module_root, allowed_modules): - print("adding module: %s" % (name)) - fp = open(build_py, "r") - try: -- module = imp.load_module("module_" + name, fp, build_py, -- (".py", "r", imp.PY_SOURCE)) - if getattr(module, "name", None) is None: - module.name = name - found_modules.append(module) diff --git a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch deleted file mode 100644 index 6a6b9f14afe0..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch +++ /dev/null @@ -1,16 +0,0 @@ -The upstream patch for this is far too big to backport, so for now, just drop -the assert given it's somewhat harmless compared to not being able to build at all. - -https://jira.mongodb.org/browse/SERVER-65664 -https://bugs.gentoo.org/855128 ---- a/src/mongo/db/stats/counters.h -+++ b/src/mongo/db/stats/counters.h -@@ -221,8 +221,6 @@ private: - AtomicWord<long long> requests{0}; - }; - CacheAligned<Together> _together{}; -- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, -- "cache line spill"); - - CacheAligned<AtomicWord<long long>> _logicalBytesOut{0}; - diff --git a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch deleted file mode 100644 index de4c11ea2844..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://bugs.gentoo.org/844235 ---- a/src/mongo/db/auth/security_key_test.cpp -+++ b/src/mongo/db/auth/security_key_test.cpp -@@ -30,6 +30,7 @@ - #include "mongo/platform/basic.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - - #include "mongo/base/string_data.h" - #include "mongo/db/auth/authorization_manager.h" ---- a/src/mongo/db/storage/storage_repair_observer.cpp -+++ b/src/mongo/db/storage/storage_repair_observer.cpp -@@ -41,6 +41,7 @@ - #include <sys/types.h> - #endif - -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - - #include "mongo/db/dbhelpers.h" ---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -@@ -34,6 +34,7 @@ - #include "mongo/db/storage/kv/kv_engine_test_harness.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - #include <memory> - ---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -36,6 +36,7 @@ - #include <limits> - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - #include <pcrecpp.h> - ---- a/src/mongo/shell/shell_utils_extended.cpp -+++ b/src/mongo/shell/shell_utils_extended.cpp -@@ -37,6 +37,7 @@ - #endif - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <fmt/format.h> - #include <fstream> - ---- a/src/mongo/util/stacktrace_threads.cpp -+++ b/src/mongo/util/stacktrace_threads.cpp -@@ -36,6 +36,7 @@ - #include <array> - #include <atomic> - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <cstdint> - #include <cstdlib> - #include <dirent.h> ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -36,6 +36,7 @@ - #include <iostream> - #include <malloc.h> - #include <pcrecpp.h> -+#include <fstream> - #include <sched.h> - #include <stdio.h> - #include <sys/mman.h> diff --git a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch deleted file mode 100644 index f66e52f1c9ed..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch +++ /dev/null @@ -1,47 +0,0 @@ -wrt PATH: -""" -https://jira.mongodb.org/browse/SERVER-94430 Upstream respond: - -> we intentionally do not ingest the environment PATH as this makes build -> reproducibility and hermiticity much harder. Instead, you should set the -> absolute paths to the tools you want to use on the command line, instead of -> relying on the PATH. - -Gentoo bug https://bugs.gentoo.org/829340 - -In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or -whatever), not in /usr/bin, and if upstream strip PATH and construct it -themselves, they surely won't contain this location. - -So we add PATH backup for scons. -""" ---- a/SConstruct -+++ b/SConstruct -@@ -2366,7 +2366,6 @@ if env.TargetOSIs('posix'): - - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. - env.Append( CCFLAGS=["-fasynchronous-unwind-tables", -- "-ggdb" if not env.TargetOSIs('emscripten') else "-g", - "-Wall", - "-Wsign-compare", - "-Wno-unknown-pragmas", -@@ -2422,6 +2421,8 @@ if env.TargetOSIs('posix'): - - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - env.Append( CXXFLAGS=["-Woverloaded-virtual"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) - - # On OS X, clang doesn't want the pthread flag at link time, or it - # issues warnings which make it impossible for us to declare link -@@ -2473,8 +2474,8 @@ if env.TargetOSIs('posix'): - ], - ) - -- #make scons colorgcc friendly -- for key in ('HOME', 'TERM'): -+ #make scons colorgcc, distcc, ccache friendly -+ for key in ('HOME', 'PATH', 'TERM'): - try: - env['ENV'][key] = os.environ[key] - except KeyError: diff --git a/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch b/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch deleted file mode 100644 index 777251577298..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript -index 5bd89fe9..489e70ac 100644 ---- a/src/mongo/installer/SConscript -+++ b/src/mongo/installer/SConscript -@@ -7,7 +7,6 @@ env = env.Clone() - - env.SConscript( - dirs=[ -- 'compass', - 'msi', - ], - exports=[ diff --git a/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch deleted file mode 100644 index ae69befcea82..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 613110b7..4987e24e 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -2958,7 +2958,7 @@ def doConfigure(myenv): - - # This warning was added in clang-5 and incorrectly flags our implementation of - # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804 -- AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions") -+ #AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions") - - # Enable sized deallocation support. - AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation') diff --git a/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch deleted file mode 100644 index 823d481c208f..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/buildscripts/scons.py b/buildscripts/scons.py -index 534fca32..c38f64df 100755 ---- a/buildscripts/scons.py -+++ b/buildscripts/scons.py -@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons') - sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path - - # pylint: disable=C0413 --from mongo.pip_requirements import verify_requirements, MissingRequirements -+#from mongo.pip_requirements import verify_requirements, MissingRequirements - --try: -- verify_requirements('etc/pip/compile-requirements.txt') --except MissingRequirements as ex: -- print(ex) -- sys.exit(1) -+#try: -+# verify_requirements('etc/pip/compile-requirements.txt') -+#except MissingRequirements as ex: -+# print(ex) -+# sys.exit(1) - - try: - import SCons.Script diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch deleted file mode 100644 index b3e3aab0c901..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/932251 -https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539 -https://bugs.gentoo.org/932251#c3 - ---- a/src/mongo/db/initialize_server_global_state.cpp -+++ b/src/mongo/db/initialize_server_global_state.cpp -@@ -328,7 +328,7 @@ - << "\" should name a file, not a directory."); - } - -- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) { -+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) { - std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename(); - boost::system::error_code ec; - boost::filesystem::rename(absoluteLogpath, renameTarget, ec); - diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch deleted file mode 100644 index 23bd6f75ffaa..000000000000 --- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch +++ /dev/null @@ -1,130 +0,0 @@ -https://bugs.gentoo.org/932251 |