summaryrefslogtreecommitdiff
path: root/dev-db/mongodb/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r--dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch12
-rw-r--r--dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch11
-rw-r--r--dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch30
3 files changed, 53 insertions, 0 deletions
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
new file mode 100644
index 000000000000..b65f91236770
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
@@ -0,0 +1,12 @@
+--- 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
+ //
diff --git a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch
new file mode 100644
index 000000000000..6afa0d75caf1
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch
@@ -0,0 +1,11 @@
+--- a/src/third_party/SConscript 2019-09-22 14:31:48.847382840 +0200
++++ b/src/third_party/SConscript 2019-09-22 14:32:56.858997243 +0200
+@@ -188,7 +188,7 @@
+ libraries = thisEnv.Flatten([libraries])
+ parts = thisEnv.Flatten([parts])
+ for lib in libraries:
+- mods = thirdPartyEnvironmentModifications[lib]
++ mods = thirdPartyEnvironmentModifications.get(lib, {})
+ if not parts:
+ thisEnv.PrependUnique(**mods)
+ else:
diff --git a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch
new file mode 100644
index 000000000000..3c929df6f964
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch
@@ -0,0 +1,30 @@
+--- 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: