FreeBSD Bugzilla – Attachment 227377 Details for
Bug 257925
databases/mongodb50: TypeError: '<' not supported between instances of 'str' and 'NoneType'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
git diff
mongodb50.sconsfix.diff (text/plain), 2.13 KB, created by
Ronald Klop
on 2021-08-23 09:54:50 UTC
(
hide
)
Description:
git diff
Filename:
MIME Type:
Creator:
Ronald Klop
Created:
2021-08-23 09:54:50 UTC
Size:
2.13 KB
patch
obsolete
>diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile >index bbf4ae522253..bbc98e69084b 100644 >--- a/databases/mongodb50/Makefile >+++ b/databases/mongodb50/Makefile >@@ -28,7 +28,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ > libcurl.so:ftp/curl \ > libsnappy.so:archivers/snappy > >-USES= compiler:c++17-lang cpe python:3.5+,build scons >+USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix > USE_RC_SUBR= mongod > > CONFLICTS_INSTALL= mongodb36 mongodb4[024] >@@ -36,6 +36,8 @@ CONFLICTS_INSTALL= mongodb36 mongodb4[024] > OPTIONS_DEFINE= LTO SASL SSL > OPTIONS_DEFAULT=LTO SASL SSL > >+SHEBANG_FILES= buildscripts/scons.py >+python_OLD_CMD= @python_interpreter@ > MAKE_ARGS= --use-system-zlib \ > --use-system-pcre \ > --use-system-snappy \ >@@ -79,6 +81,9 @@ CPE_PRODUCT= mongodb > pre-patch: > ${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S > >+do-build: >+ ${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS} >+ > do-install: > .for f in mongo mongod mongos > ${INSTALL_PROGRAM} ${WRKSRC}/build/install${PREFIX}/bin/${f} ${STAGEDIR}${PREFIX}/bin >diff --git a/databases/mongodb50/files/patch-buildscripts_scons.py b/databases/mongodb50/files/patch-buildscripts_scons.py >new file mode 100644 >index 000000000000..20d0429965af >--- /dev/null >+++ b/databases/mongodb50/files/patch-buildscripts_scons.py >@@ -0,0 +1,25 @@ >+--- buildscripts/scons.py.orig 2021-08-23 09:10:10 UTC >++++ buildscripts/scons.py >+@@ -18,14 +18,14 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scon >+ >+ sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path >+ >+-# pylint: disable=C0413 >+-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) >++## pylint: disable=C0413 >++#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: >+ import SCons.Script
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
ronald-lists
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 257925
:
227377
|
227491