summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r--dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch32
-rw-r--r--dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch46
-rw-r--r--dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch12
3 files changed, 0 insertions, 90 deletions
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
deleted file mode 100644
index d7bfb35b00d5..000000000000
--- a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index fe7975b..92659a7 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1619,7 +1619,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=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1631,6 +1630,8 @@ 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'] )
-
-@@ -1650,8 +1651,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:
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch b/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch
deleted file mode 100644
index 133c10fd258b..000000000000
--- a/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 9cde728..e29664e 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -629,33 +629,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
- for target in env["DIST_BINARIES"]:
- installBinary(env, "db/modules/" + target)
-
--# Set the download url to the right place
--compass_type = 'compass-community'
--if 'enterprise' in env['MONGO_MODULES']:
-- compass_type = 'compass'
--
--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.in"
--
--compass_python_interpreter = '/usr/bin/env python2'
--if env.TargetOSIs('darwin'):
-- compass_python_interpreter = '/usr/bin/env python'
--
--compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
-- SUBST_DICT=[
-- ('@compass_type@', compass_type),
-- ('@python_interpreter@', compass_python_interpreter),
-- ])
--distBinaries.append(compass_installer)
--
--compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
--
--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"):
-@@ -673,7 +646,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:])}'
- ],
- ),
diff --git a/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch b/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
deleted file mode 100644
index b65f91236770..000000000000
--- a/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/mongo/util/heap_profiler.cpp
-+++ b/src/mongo/util/heap_profiler.cpp
-@@ -49,6 +49,9 @@
- #include <dlfcn.h>
- #include <execinfo.h>
-
-+// for abi::__cxa_demangle
-+#include <cxxabi.h>
-+
- //
- // Sampling heap profiler
- //