[dev-db/mongodb] bump, need to rebase patches still
This commit is contained in:
parent
a4cb5f1e58
commit
fb746c5923
@ -1,2 +1,2 @@
|
|||||||
DIST mongodb-src-r4.4.25.tar.gz 50892028 BLAKE2B 5c383a7f1b5ec3ef155b5b73b68e501fddbd5022076162710f3374854c20757565f19463173632d26c3db5254e0286cddcf0b2a98e532d353953518050eda2e1 SHA512 efe145c6bebc3b6473b3cc9007574752834ac0f84f57897a6d529b5e59f1b4d414632e4736348497365055cd5d9c98c7e4923038c57da3b2e0024c5c1d0432b6
|
DIST mongodb-src-r4.4.27.tar.gz 51452977 BLAKE2B 00555f15cac49b5863024eef98ce303862ee5f4253750108d67893849574c02ac5dee3e35f6ad3c367427bc0d393cadcb0eddc2d600cce0bc1b480b65df0126d SHA512 23a714b99c3bbfd9643c5536ddaf8b3a31aaa731fcc0618f9853842c06bc25461c6224f1d06f140a5412f49aa9f05654c35467de4d044d564323131dac46e85e
|
||||||
DIST mongodb-src-r5.0.21.tar.gz 56254443 BLAKE2B a866dbb433a8c955b6edaef46a82f6d18d1837359ede81812f5dac480fd02978f02d88e32396a9359073755b6c594486d2b830ddf30fa21eec068c3011a77558 SHA512 2409ddcee18adbbd7dedbd177b9dd0a953c0877487dda3824828def8c9739218d75629eb3bed3da86dbd7ec589e5c9117620a1900c5d97dcc1f028dab5f58416
|
DIST mongodb-src-r5.0.23.tar.gz 56289856 BLAKE2B e2d8b1939f21ddca4af3c67724f026416a9b97e7c01e34a0c8c748f256258570637a88c9cc1729bbae541b4d995f903c2e7e2246607bb20d22bb9c5aeb35e5c9 SHA512 eb9ce72eaefb646d9567c85d9810a1103c778f1da047a55d301260b9d09fb65fc6fcc2f8b343aa229fdcabd8320647182fbf56f3ae7b94fe8acd64761e5cf664
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
--- a/SConstruct 2019-08-21 09:25:00.980260318 +0200
|
|
||||||
+++ b/SConstruct 2019-08-21 09:27:53.653601283 +0200
|
|
||||||
@@ -1858,7 +1858,6 @@
|
|
||||||
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
|
|
||||||
env.Append( CCFLAGS=["-fno-omit-frame-pointer",
|
|
||||||
"-fno-strict-aliasing",
|
|
||||||
- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
|
|
||||||
"-pthread",
|
|
||||||
"-Wall",
|
|
||||||
"-Wsign-compare",
|
|
||||||
@@ -1870,6 +1869,8 @@
|
|
||||||
env.Append( CCFLAGS=["-Werror"] )
|
|
||||||
|
|
||||||
env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
|
|
||||||
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
|
|
||||||
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
|
||||||
if env.ToolchainIs('clang'):
|
|
||||||
env.Append( CXXFLAGS=['-Werror=unused-result'] )
|
|
||||||
|
|
||||||
@@ -1890,8 +1891,8 @@
|
|
||||||
|
|
||||||
env.Append( LIBS=[] )
|
|
||||||
|
|
||||||
- #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:
|
|
@ -1,45 +0,0 @@
|
|||||||
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
|
|
||||||
index 0379fcb0..1aabddba 100644
|
|
||||||
--- a/src/mongo/SConscript
|
|
||||||
+++ b/src/mongo/SConscript
|
|
||||||
@@ -808,32 +808,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
|
|
||||||
for target in env["DIST_BINARIES"]:
|
|
||||||
installBinary(env, "db/modules/" + target)
|
|
||||||
|
|
||||||
-compass_script = "install_compass"
|
|
||||||
-if env.TargetOSIs('windows'):
|
|
||||||
- # On windows the .in needs to be explicitly added to the file.
|
|
||||||
- compass_script = "Install-Compass.ps1"
|
|
||||||
-
|
|
||||||
-compass_installer = f"#/src/mongo/installer/compass/{compass_script}"
|
|
||||||
-
|
|
||||||
-distBinaries.append(compass_installer)
|
|
||||||
-
|
|
||||||
-if not hygienic:
|
|
||||||
- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
|
|
||||||
-else:
|
|
||||||
- compass_script_installer = env.AutoInstall(
|
|
||||||
- 'bin',
|
|
||||||
- source=[
|
|
||||||
- compass_installer,
|
|
||||||
- ],
|
|
||||||
- INSTALL_ALIAS=[
|
|
||||||
- 'tools',
|
|
||||||
- ],
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-if env.TargetOSIs('posix'):
|
|
||||||
- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
|
|
||||||
- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
|
|
||||||
-
|
|
||||||
# "dist" target is valid only when --use-new-tools is specified
|
|
||||||
# Attempts to build release artifacts without tools must fail
|
|
||||||
if has_option("use-new-tools"):
|
|
||||||
@@ -851,7 +825,6 @@ if has_option("use-new-tools"):
|
|
||||||
'--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
|
|
||||||
'--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
|
|
||||||
'--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
|
|
||||||
- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
|
|
||||||
'${TEMPFILE(SOURCES[1:])}'
|
|
||||||
],
|
|
||||||
),
|
|
@ -1,41 +0,0 @@
|
|||||||
https://bugs.gentoo.org/844235
|
|
||||||
--- a/src/mongo/util/processinfo_linux.cpp
|
|
||||||
+++ b/src/mongo/util/processinfo_linux.cpp
|
|
||||||
@@ -51,6 +51,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
+#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include <boost/none.hpp>
|
|
||||||
#include <boost/optional.hpp>
|
|
||||||
#include <fmt/format.h>
|
|
||||||
--- 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 "mongo/base/simple_string_data_comparator.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 <fstream>
|
|
||||||
|
|
||||||
#include "mongo/scripting/engine.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"
|
|
Loading…
Reference in New Issue
Block a user