[dev-db/mongodb] bump, need to rebase patches still
This commit is contained in:
@@ -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"
|
||||
Reference in New Issue
Block a user