[dev-db/mongodb] remove 4.4, its EOL
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 89c044ab..a6d02072 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -2064,7 +2064,6 @@ if env.TargetOSIs('posix'):
|
||||
env.Append( CCFLAGS=["-fno-omit-frame-pointer",
|
||||
"-fno-strict-aliasing",
|
||||
"-fasynchronous-unwind-tables",
|
||||
- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
|
||||
"-pthread",
|
||||
"-Wall",
|
||||
"-Wsign-compare",
|
||||
@@ -2076,6 +2075,9 @@ if env.TargetOSIs('posix'):
|
||||
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'] )
|
||||
|
||||
@@ -2096,8 +2098,8 @@ if env.TargetOSIs('posix'):
|
||||
|
||||
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,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 "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/bson/bson_validate.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>
|
||||
--- 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 <cctype>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
@@ -1,29 +0,0 @@
|
||||
Don't automagically force lld > gold > bfd. Leave it up to the user.
|
||||
|
||||
In particular, avoids issues with LTO enabled (via the flag/scons option)
|
||||
where using GCC as compiler, as lld can't do LTO with GCC.
|
||||
|
||||
https://bugs.gentoo.org/769986
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -3109,20 +3109,6 @@ def doConfigure(myenv):
|
||||
myenv.Append( CCFLAGS=["/Zc:inline"])
|
||||
|
||||
if myenv.ToolchainIs('gcc', 'clang'):
|
||||
- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
|
||||
- # because it is much faster. Don't use it if the user has already configured another linker
|
||||
- # selection manually.
|
||||
- if not any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
|
||||
-
|
||||
- # lld has problems with separate debug info on some platforms. See:
|
||||
- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
|
||||
- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
|
||||
- if get_option('separate-debug') == 'off':
|
||||
- if not AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=lld'):
|
||||
- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
|
||||
- else:
|
||||
- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
|
||||
-
|
||||
# Usually, --gdb-index is too expensive in big static binaries, but for dynamic
|
||||
# builds it works well.
|
||||
if link_model.startswith("dynamic"):
|
||||
@@ -1,43 +0,0 @@
|
||||
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
|
||||
index 62fbfc02..5be336f7 100644
|
||||
--- a/src/mongo/SConscript
|
||||
+++ b/src/mongo/SConscript
|
||||
@@ -841,30 +841,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'):
|
||||
- compass_script = "Install-Compass.ps1"
|
||||
-
|
||||
-compass_installer = f"$BUILD_DIR/mongo/installer/compass/{compass_script}"
|
||||
-
|
||||
-distBinaries.append(compass_installer)
|
||||
-
|
||||
-if not hygienic:
|
||||
- compass_script_installer = env.Install("$DESTDIR/bin", compass_installer)
|
||||
-else:
|
||||
- compass_script_installer = env.AutoInstall(
|
||||
- target='$PREFIX_BINDIR',
|
||||
- source=[
|
||||
- compass_installer,
|
||||
- ],
|
||||
- AIB_COMPONENT='dist',
|
||||
- AIB_ROLE='runtime',
|
||||
- )
|
||||
-
|
||||
-if env.TargetOSIs('posix'):
|
||||
- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
|
||||
- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
|
||||
-
|
||||
if not hygienic:
|
||||
server_archive = env.Command(
|
||||
target='#/${SERVER_ARCHIVE}',
|
||||
@@ -878,7 +854,6 @@ if not hygienic:
|
||||
'--transform $BUILD_DIR/mongo/stripped/db/modules/enterprise=$SERVER_DIST_BASENAME/bin',
|
||||
'--transform $BUILD_DIR/mongo/stripped=$SERVER_DIST_BASENAME/bin',
|
||||
'--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
|
||||
- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
|
||||
'${TEMPFILE(SOURCES[1:])}'
|
||||
],
|
||||
),
|
||||
Reference in New Issue
Block a user