diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2018-01-05 23:17:27 +0000 |
|---|---|---|
| committer |   Ultrabug <ultrabug@gentoo.org> | 2018-01-06 22:34:32 +0100 |
| commit | b4064aaa6b6790f7eff7a2dd55aa32ae7ba6dac0 (patch) | |
| tree | 7c4876f921100ffecf18017cdc66017139939221 /dev-db/mongodb/files | |
| parent | app-admin/mongo-tools: version bump to 3.6.1 (diff) | |
| download | gentoo-b4064aaa6b6790f7eff7a2dd55aa32ae7ba6dac0.tar.gz gentoo-b4064aaa6b6790f7eff7a2dd55aa32ae7ba6dac0.tar.bz2 gentoo-b4064aaa6b6790f7eff7a2dd55aa32ae7ba6dac0.zip | |
dev-db/mongodb: version bump to 3.6.1
Diffstat (limited to 'dev-db/mongodb/files')
| -rw-r--r-- | dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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 new file mode 100644 index 000000000000..133c10fd258b --- /dev/null +++ b/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch @@ -0,0 +1,46 @@ +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:])}' + ], + ), |