Attachment 235682 Details for Bug 265210 – Patch for mongodb50

[patch] Patch for mongodb50

mongodb50-systemlibs-v1.patch (text/plain), 6.02 KB, created by Daniel Engberg on 2022-08-04 22:06:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-08-04 22:06:22 UTC

Size: 6.02 KB

patch

obsolete

>diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
>index b49ce5c5e633..ff720d689dd1 100644
>--- a/databases/mongodb50/Makefile
>+++ b/databases/mongodb50/Makefile
>@@ -23,9 +23,14 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils \
> 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
>-LIB_DEPENDS=	libcurl.so:ftp/curl \
>+LIB_DEPENDS=	libboost_log.so:devel/boost-libs \
>+		libcurl.so:ftp/curl \
> 		libpcre.so:devel/pcre \
>-		libsnappy.so:archivers/snappy
>+		libsnappy.so:archivers/snappy \
>+		libstemmer.so:textproc/snowballstemmer \
>+		libunwind.so:devel/libunwind \
>+		libyaml-cpp.so:devel/yaml-cpp \
>+		libzstd.so:archivers/zstd
> 
> USES=		compiler:c++17-lang cpe python:3.5+,build scons shebangfix
> USE_RC_SUBR=	mongod
>@@ -37,9 +42,14 @@ MAKE_ARGS=	--cxx-std=17 \
> 		--disable-warnings-as-errors \
> 		--libc++ \
> 		--runtime-hardening=on \
>+		--use-system-boost \
> 		--use-system-pcre \
> 		--use-system-snappy \
>+		--use-system-stemmer \
>+		--use-system-libunwind \
>+		--use-system-yaml \
> 		--use-system-zlib \
>+		--use-system-zstd \
> 		-j ${MAKE_JOBS_NUMBER} \
> 		AR=${PREFIX}/bin/ar \
> 		VERBOSE=on
>@@ -79,6 +89,15 @@ 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
> 
>+post-patch:
>+	${RM} -rf ${WRKSRC}/src/third_party/boost
>+	${RM} -rf ${WRKSRC}/src/third_party/pcre-*
>+	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
>+	${RM} -rf ${WRKSRC}/src/third_party/unwind
>+	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
>+	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
>+	${RM} -rf ${WRKSRC}/src/third_party/zstandard-*
>+
> do-build:
> 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
> 
>diff --git a/databases/mongodb50/files/patch-SConstruct b/databases/mongodb50/files/patch-SConstruct
>index fa8b0bb3ca4f..01af9a42437c 100644
>--- a/databases/mongodb50/files/patch-SConstruct
>+++ b/databases/mongodb50/files/patch-SConstruct
>@@ -43,3 +43,12 @@
>          "i386"       : { "-march=" : "nocona",       "-mtune=" : "generic"                        },
>          "ppc64le"    : { "-mcpu="  : "power8",       "-mtune=" : "power8", "-mcmodel=" : "medium" },
>          "s390x"      : { "-march=" : "z196",         "-mtune=" : "zEC12"                          },
>+@@ -2554,7 +2558,7 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
>+     if "sandybridge" in selected_experimental_optimizations:
>+         default_targeting_flags_for_architecture["x86_64"] = {
>+             "-march="                : "sandybridge",
>+-            "-mtune="                : "generic",
>++    #       "-mtune="                : "generic",
>+             "-mprefer-vector-width=" : "128",
>+         }
>+ 
>diff --git a/databases/mongodb50/files/patch-boost-179-compat b/databases/mongodb50/files/patch-boost-179-compat
>new file mode 100644
>index 000000000000..8135db48dd3c
>--- /dev/null
>+++ b/databases/mongodb50/files/patch-boost-179-compat
>@@ -0,0 +1,70 @@
>+--- src/mongo/db/auth/security_key_test.cpp
>++++ src/mongo/db/auth/security_key_test.cpp
>+@@ -30,6 +30,7 @@
>+ #include "mongo/platform/basic.h"
>+ 
>+ #include <boost/filesystem.hpp>
>++#include <boost/filesystem/fstream.hpp>
>+ 
>+ #include "mongo/base/string_data.h"
>+ #include "mongo/db/auth/authorization_manager.h"
>+--- src/mongo/db/storage/storage_repair_observer.cpp
>++++ src/mongo/db/storage/storage_repair_observer.cpp
>+@@ -41,6 +41,7 @@
>+ #include <sys/types.h>
>+ #endif
>+ 
>++#include <boost/filesystem/fstream.hpp>
>+ #include <boost/filesystem/path.hpp>
>+ 
>+ #include "mongo/db/dbhelpers.h"
>+--- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
>++++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
>+@@ -34,6 +34,7 @@
>+ #include "mongo/db/storage/kv/kv_engine_test_harness.h"
>+ 
>+ #include <boost/filesystem.hpp>
>++#include <boost/filesystem/fstream.hpp>
>+ #include <boost/filesystem/path.hpp>
>+ #include <memory>
>+ 
>+--- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
>++++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
>+@@ -36,6 +36,7 @@
>+ #include <limits>
>+ 
>+ #include <boost/filesystem.hpp>
>++#include <boost/filesystem/fstream.hpp>
>+ #include <boost/filesystem/path.hpp>
>+ 
>+ #include "mongo/base/simple_string_data_comparator.h"
>+--- src/mongo/shell/shell_utils_extended.cpp
>++++ src/mongo/shell/shell_utils_extended.cpp
>+@@ -37,6 +37,7 @@
>+ #endif
>+ 
>+ #include <boost/filesystem.hpp>
>++#include <boost/filesystem/fstream.hpp>
>+ #include <fmt/format.h>
>+ #include <fstream>
>+ 
>+--- src/mongo/util/stacktrace_threads.cpp
>++++ src/mongo/util/stacktrace_threads.cpp
>+@@ -36,6 +36,7 @@
>+ #include <array>
>+ #include <atomic>
>+ #include <boost/filesystem.hpp>
>++#include <boost/filesystem/fstream.hpp>
>+ #include <cstdint>
>+ #include <cstdlib>
>+ #include <dirent.h>
>+--- src/mongo/util/processinfo_linux.cpp
>++++ src/mongo/util/processinfo_linux.cpp
>+@@ -36,6 +36,7 @@
>+ #include <iostream>
>+ #include <malloc.h>
>+ #include <pcrecpp.h>
>++#include <fstream>
>+ #include <sched.h>
>+ #include <stdio.h>
>+ #include <sys/mman.h>
>diff --git a/databases/mongodb50/files/patch-boost-179-link-fix b/databases/mongodb50/files/patch-boost-179-link-fix
>new file mode 100644
>index 000000000000..157ebaaf0221
>--- /dev/null
>+++ b/databases/mongodb50/files/patch-boost-179-link-fix
>@@ -0,0 +1,21 @@
>+--- SConstruct
>++++ SConstruct
>+@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
>+             "BOOST_LOG_NO_SHORTHAND_NAMES",
>+             "BOOST_LOG_USE_NATIVE_SYSLOG",
>+             "BOOST_LOG_WITHOUT_THREAD_ATTR",
>++            "BOOST_LOG_DYN_LINK",
>+             "ABSL_FORCE_ALIGNED_ACCESS",
>+         ]
>+     )
>+ 
>+-    if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
>+-        conf.env.AppendUnique(
>+-            CPPDEFINES=[
>+-                "BOOST_LOG_DYN_LINK",
>+-            ]
>+-    )
>+-
>+     if use_system_version_of_library("boost"):
>+         if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
>+             myenv.ConfError("can't find boost headers")

Actions: View | Diff

Attachments on bug 265210: 235682