| 1 |
commit: c3207585e9853903dcd30537bf888356675c7609 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Oct 26 10:07:52 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 29 21:40:14 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3207585 |
| 7 |
|
| 8 |
dev-db/mongodb: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22708 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../mongodb/files/mongodb-4.4.1-no-compass.patch | 56 ---------------------- |
| 16 |
.../mongodb/files/mongodb-4.4.1-unwind-gcc10.patch | 12 ----- |
| 17 |
2 files changed, 68 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch b/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 15a7f9534bc..00000000000 |
| 22 |
--- a/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,56 +0,0 @@ |
| 25 |
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript |
| 26 |
-index 8acf5469..737c31d4 100644 |
| 27 |
---- a/src/mongo/SConscript |
| 28 |
-+++ b/src/mongo/SConscript |
| 29 |
-@@ -834,43 +834,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()): |
| 30 |
- for target in env["DIST_BINARIES"]: |
| 31 |
- installBinary(env, "db/modules/" + target) |
| 32 |
- |
| 33 |
--compass_type = 'compass' |
| 34 |
-- |
| 35 |
--compass_script = "install_compass.in" |
| 36 |
--if env.TargetOSIs('windows'): |
| 37 |
-- compass_script = "Install-Compass.ps1.in" |
| 38 |
-- |
| 39 |
--compass_python_interpreter = '/usr/bin/env python2' |
| 40 |
--if env.TargetOSIs('darwin'): |
| 41 |
-- compass_python_interpreter = '/usr/bin/env python' |
| 42 |
-- |
| 43 |
--compass_installer = env.Substfile( |
| 44 |
-- target="$BUILD_DIR/mongo/installer/compass/" + compass_script[:-3], |
| 45 |
-- source='installer/compass/' + compass_script, |
| 46 |
-- SUBST_DICT=[ |
| 47 |
-- ('@compass_type@', compass_type), |
| 48 |
-- ('@python_interpreter@', compass_python_interpreter), |
| 49 |
-- ], |
| 50 |
--) |
| 51 |
-- |
| 52 |
--distBinaries.append(compass_installer) |
| 53 |
-- |
| 54 |
--if not hygienic: |
| 55 |
-- compass_script_installer = env.Install("$DESTDIR/bin", compass_installer) |
| 56 |
--else: |
| 57 |
-- compass_script_installer = env.AutoInstall( |
| 58 |
-- target='$PREFIX_BINDIR', |
| 59 |
-- source=[ |
| 60 |
-- compass_installer, |
| 61 |
-- ], |
| 62 |
-- AIB_COMPONENT='dist', |
| 63 |
-- AIB_ROLE='runtime', |
| 64 |
-- ) |
| 65 |
-- |
| 66 |
--if env.TargetOSIs('posix'): |
| 67 |
-- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' ) |
| 68 |
-- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' ) |
| 69 |
-- |
| 70 |
- if not hygienic: |
| 71 |
- server_archive = env.Command( |
| 72 |
- target='#/${SERVER_ARCHIVE}', |
| 73 |
-@@ -884,7 +847,6 @@ if not hygienic: |
| 74 |
- '--transform $BUILD_DIR/mongo/stripped/db/modules/enterprise=$SERVER_DIST_BASENAME/bin', |
| 75 |
- '--transform $BUILD_DIR/mongo/stripped=$SERVER_DIST_BASENAME/bin', |
| 76 |
- '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin', |
| 77 |
-- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin', |
| 78 |
- '${TEMPFILE(SOURCES[1:])}' |
| 79 |
- ], |
| 80 |
- ), |
| 81 |
|
| 82 |
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch b/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch |
| 83 |
deleted file mode 100644 |
| 84 |
index a80f7e6474f..00000000000 |
| 85 |
--- a/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch |
| 86 |
+++ /dev/null |
| 87 |
@@ -1,12 +0,0 @@ |
| 88 |
-diff --git a/src/third_party/unwind/SConscript b/src/third_party/unwind/SConscript |
| 89 |
-index ed947c8e..7308956f 100644 |
| 90 |
---- a/src/third_party/unwind/SConscript |
| 91 |
-+++ b/src/third_party/unwind/SConscript |
| 92 |
-@@ -90,6 +90,7 @@ if env['TARGET_ARCH'] == 'aarch64': |
| 93 |
- |
| 94 |
- env.Append( |
| 95 |
- CCFLAGS=[ |
| 96 |
-+ '-fcommon', |
| 97 |
- '-fexceptions', |
| 98 |
- '-Wno-unused-result', |
| 99 |
- '-Wno-unused-value', |
Archives