aboutsummaryrefslogtreecommitdiff
path: root/system/mongodb/patches
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2021-11-21 10:35:46 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-11-22 09:10:21 +0700
commit93d08acee128b4d9714bc7c911c5fb88938be804 (patch)
tree466608a8f9dd66d686f61c4cf8aea217694c77d3 /system/mongodb/patches
parent8fb7497f26e2bfcaf84fbc37a2f4590237b0f1d3 (diff)
system/mongodb: Updated for version 5.0.4.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/mongodb/patches')
-rw-r--r--system/mongodb/patches/01_mongodb-4.4.1-boost.patch23
-rw-r--r--system/mongodb/patches/02_mongodb-4.4.1-gcc11.patch12
-rw-r--r--system/mongodb/patches/03_mongodb-5.0.2-fix-scons.patch32
-rw-r--r--system/mongodb/patches/04_mongodb-5.0.2-no-compass.patch12
-rw-r--r--system/mongodb/patches/05_mongodb-5.0.2-skip-no-exceptions.patch13
-rw-r--r--system/mongodb/patches/06_mongodb-5.0.2-skip-reqs-check.patch24
6 files changed, 116 insertions, 0 deletions
diff --git a/system/mongodb/patches/01_mongodb-4.4.1-boost.patch b/system/mongodb/patches/01_mongodb-4.4.1-boost.patch
new file mode 100644
index 0000000000000..009ca6826a4f5
--- /dev/null
+++ b/system/mongodb/patches/01_mongodb-4.4.1-boost.patch
@@ -0,0 +1,23 @@
+diff --git a/SConstruct b/SConstruct
+index 89c044ab..0484e475 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
+ "BOOST_LOG_NO_SHORTHAND_NAMES",
+ "BOOST_LOG_USE_NATIVE_SYSLOG",
+ "BOOST_LOG_WITHOUT_THREAD_ATTR",
++ "BOOST_LOG_DYN_LINK",
+ "ABSL_FORCE_ALIGNED_ACCESS",
+ ]
+ )
+
+- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
+- conf.env.AppendUnique(
+- CPPDEFINES=[
+- "BOOST_LOG_DYN_LINK",
+- ]
+- )
+-
+ if use_system_version_of_library("boost"):
+ if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
+ myenv.ConfError("can't find boost headers")
diff --git a/system/mongodb/patches/02_mongodb-4.4.1-gcc11.patch b/system/mongodb/patches/02_mongodb-4.4.1-gcc11.patch
new file mode 100644
index 0000000000000..a6ff02dcf66f5
--- /dev/null
+++ b/system/mongodb/patches/02_mongodb-4.4.1-gcc11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/768339
+
+--- a/src/mongo/db/exec/plan_stats.h
++++ b/src/mongo/db/exec/plan_stats.h
+@@ -33,6 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
++#include <optional>
+
+ #include "mongo/db/index/multikey_paths.h"
+
diff --git a/system/mongodb/patches/03_mongodb-5.0.2-fix-scons.patch b/system/mongodb/patches/03_mongodb-5.0.2-fix-scons.patch
new file mode 100644
index 0000000000000..2d1a2f9312bb3
--- /dev/null
+++ b/system/mongodb/patches/03_mongodb-5.0.2-fix-scons.patch
@@ -0,0 +1,32 @@
+diff --git a/SConstruct b/SConstruct
+index 115de78a..613110b7 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2366,7 +2366,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=["-fasynchronous-unwind-tables",
+- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
+ "-Wall",
+ "-Wsign-compare",
+ "-Wno-unknown-pragmas",
+@@ -2422,6 +2421,8 @@ if env.TargetOSIs('posix'):
+
+ # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+ env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # On OS X, clang doesn't want the pthread flag at link time, or it
+ # issues warnings which make it impossible for us to declare link
+@@ -2473,8 +2474,8 @@ if env.TargetOSIs('posix'):
+ ],
+ )
+
+- #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/system/mongodb/patches/04_mongodb-5.0.2-no-compass.patch b/system/mongodb/patches/04_mongodb-5.0.2-no-compass.patch
new file mode 100644
index 0000000000000..7772515772985
--- /dev/null
+++ b/system/mongodb/patches/04_mongodb-5.0.2-no-compass.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript
+index 5bd89fe9..489e70ac 100644
+--- a/src/mongo/installer/SConscript
++++ b/src/mongo/installer/SConscript
+@@ -7,7 +7,6 @@ env = env.Clone()
+
+ env.SConscript(
+ dirs=[
+- 'compass',
+ 'msi',
+ ],
+ exports=[
diff --git a/system/mongodb/patches/05_mongodb-5.0.2-skip-no-exceptions.patch b/system/mongodb/patches/05_mongodb-5.0.2-skip-no-exceptions.patch
new file mode 100644
index 0000000000000..ae69befcea829
--- /dev/null
+++ b/system/mongodb/patches/05_mongodb-5.0.2-skip-no-exceptions.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index 613110b7..4987e24e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2958,7 +2958,7 @@ def doConfigure(myenv):
+
+ # This warning was added in clang-5 and incorrectly flags our implementation of
+ # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804
+- AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
++ #AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
+
+ # Enable sized deallocation support.
+ AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation')
diff --git a/system/mongodb/patches/06_mongodb-5.0.2-skip-reqs-check.patch b/system/mongodb/patches/06_mongodb-5.0.2-skip-reqs-check.patch
new file mode 100644
index 0000000000000..823d481c208f0
--- /dev/null
+++ b/system/mongodb/patches/06_mongodb-5.0.2-skip-reqs-check.patch
@@ -0,0 +1,24 @@
+diff --git a/buildscripts/scons.py b/buildscripts/scons.py
+index 534fca32..c38f64df 100755
+--- a/buildscripts/scons.py
++++ b/buildscripts/scons.py
+@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons')
+ sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
+
+ # pylint: disable=C0413
+-from mongo.pip_requirements import verify_requirements, MissingRequirements
++#from mongo.pip_requirements import verify_requirements, MissingRequirements
+
+-try:
+- verify_requirements('etc/pip/compile-requirements.txt')
+-except MissingRequirements as ex:
+- print(ex)
+- sys.exit(1)
++#try:
++# verify_requirements('etc/pip/compile-requirements.txt')
++#except MissingRequirements as ex:
++# print(ex)
++# sys.exit(1)
+
+ try:
+ import SCons.Script