diff options
Diffstat (limited to 'dev-db/mongodb/files')
7 files changed, 185 insertions, 0 deletions
diff --git a/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch b/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch new file mode 100644 index 000000000000..de2eda82f213 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch @@ -0,0 +1,45 @@ +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:])}' + ], + ), diff --git a/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch b/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch new file mode 100644 index 000000000000..0755705ed55f --- /dev/null +++ b/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch @@ -0,0 +1,43 @@ +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:])}' + ], + ), diff --git a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch new file mode 100644 index 000000000000..2d1a2f9312bb --- /dev/null +++ b/dev-db/mongodb/files/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/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch new file mode 100644 index 000000000000..b9c5241be374 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch @@ -0,0 +1,16 @@ +diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h +index 7b15bb56..4d8f73ad 100644 +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -105,10 +105,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK diff --git a/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch b/dev-db/mongodb/files/mongodb-5.0.2-no-compass.patch new file mode 100644 index 000000000000..777251577298 --- /dev/null +++ b/dev-db/mongodb/files/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/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-no-exceptions.patch new file mode 100644 index 000000000000..ae69befcea82 --- /dev/null +++ b/dev-db/mongodb/files/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/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch b/dev-db/mongodb/files/mongodb-5.0.2-skip-reqs-check.patch new file mode 100644 index 000000000000..823d481c208f --- /dev/null +++ b/dev-db/mongodb/files/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 |