[dev-db/mongodb] fix patch
This commit is contained in:
parent
d644135c79
commit
e0b4b09600
dev-db/mongodb
@ -1,25 +1,24 @@
|
||||
buildscripts/moduleconfig.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
buildscripts/moduleconfig.py | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py
|
||||
index b4d0bba0490..f59ddd7bc5c 100644
|
||||
index b4d0bba0490..03541fab940 100644
|
||||
--- a/buildscripts/moduleconfig.py
|
||||
+++ b/buildscripts/moduleconfig.py
|
||||
@@ -27,7 +27,7 @@ MongoDB SConscript files do.
|
||||
@@ -27,7 +27,6 @@ MongoDB SConscript files do.
|
||||
__all__ = ('discover_modules', 'discover_module_directories', 'configure_modules',
|
||||
'register_module_test') # pylint: disable=undefined-all-variable
|
||||
|
||||
-import imp
|
||||
+import importlib
|
||||
import inspect
|
||||
import os
|
||||
|
||||
@@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules):
|
||||
@@ -71,8 +70,6 @@ def discover_modules(module_root, allowed_modules):
|
||||
print("adding module: %s" % (name))
|
||||
fp = open(build_py, "r")
|
||||
try:
|
||||
- module = imp.load_module("module_" + name, fp, build_py,
|
||||
+ module = importlib.load_module("module_" + name, fp, build_py,
|
||||
(".py", "r", imp.PY_SOURCE))
|
||||
- (".py", "r", imp.PY_SOURCE))
|
||||
if getattr(module, "name", None) is None:
|
||||
module.name = name
|
||||
module.name = name
|
||||
found_modules.append(module)
|
@ -63,7 +63,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
|
||||
"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
|
||||
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
|
||||
"${FILESDIR}/${P}-py3k12.patch"
|
||||
"${FILESDIR}/${P}-no-enterprise.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
@ -99,15 +99,13 @@ src_prepare() {
|
||||
|
||||
# remove compass
|
||||
rm -r src/mongo/installer/compass || die
|
||||
|
||||
# remove features tied to enterprise license
|
||||
rm -r src/mongo/db/modules/enterprise || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
|
||||
# --use-system-icu fails tests
|
||||
# --use-system-tcmalloc is strongly NOT recommended:
|
||||
# --modules="" is to remove features tied to enterprise license
|
||||
scons_opts=(
|
||||
AR="$(tc-getAR)"
|
||||
CC="$(tc-getCC)"
|
||||
@ -116,6 +114,7 @@ src_configure() {
|
||||
|
||||
VERBOSE=1
|
||||
VARIANT_DIR=gentoo
|
||||
--modules=""
|
||||
|
||||
--disable-warnings-as-errors
|
||||
--use-system-boost
|
||||
|
@ -72,7 +72,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
|
||||
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
|
||||
"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
|
||||
"${FILESDIR}/${PN}-4.4.29-py3k12.patch"
|
||||
"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
@ -112,10 +112,6 @@ src_prepare() {
|
||||
# remove compass
|
||||
rm -r src/mongo/installer/compass || die
|
||||
|
||||
# remove features tied to enterprise license
|
||||
rm -r src/mongo/db/modules/enterprise || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
|
||||
# --use-system-icu fails tests
|
||||
@ -128,6 +124,7 @@ src_configure() {
|
||||
|
||||
VERBOSE=1
|
||||
VARIANT_DIR=gentoo
|
||||
--modules=""
|
||||
|
||||
--disable-warnings-as-errors
|
||||
--jobs="$(makeopts_jobs)"
|
||||
|
Loading…
Reference in New Issue
Block a user