cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/mongodb50: use in-source boost

Browse Source 
Does not compile with new boost 1.81.0 from ports.

PR:	269024
Approved by: rene (mentor)
Differential Revision: https://reviews.freebsd.org/D38134
This commit is contained in:
Ronald Klop 2023-01-20 11:02:11 +01:00
parent 2a08af5db2
commit d04cd83954
No known key found for this signature in database
GPG Key ID: 551E8E6207A42166
3 changed files with 2 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
databases/mongodb50/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 5.0.14
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
@ -24,8 +24,7 @@ ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD
BUILD_DEPENDS= ${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= libboost_log.so:devel/boost-libs \
libcurl.so:ftp/curl \
LIB_DEPENDS= libcurl.so:ftp/curl \
libpcre.so:devel/pcre \
libsnappy.so:archivers/snappy \
libstemmer.so:textproc/snowballstemmer \
@ -43,7 +42,6 @@ MAKE_ARGS= --cxx-std=17 \
--disable-warnings-as-errors \
--libc++ \
--runtime-hardening=on \
--use-system-boost \
--use-system-libunwind \
--use-system-pcre \
--use-system-snappy \
@ -93,7 +91,6 @@ 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

70
databases/mongodb50/files/patch-boost-179-compat
View File

@ -1,70 +0,0 @@
--- 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>

21
databases/mongodb50/files/patch-boost-179-link-fix
View File

@ -1,21 +0,0 @@
--- 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")