Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jan 2023 14:07:29 GMT
From:      Ronald Klop <ronald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d04cd83954fa - main - databases/mongodb50: use in-source boost
Message-ID:  <202301201407.30KE7T4P056440@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d04cd83954fab0573cd898dfcde840219e34aef2

commit d04cd83954fab0573cd898dfcde840219e34aef2
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2023-01-20 10:02:11 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2023-01-20 13:15:01 +0000

    databases/mongodb50: use in-source boost
    
    Does not compile with new boost 1.81.0 from ports.
    
    PR:     269024
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D38134
---
 databases/mongodb50/Makefile                       |  7 +--
 databases/mongodb50/files/patch-boost-179-compat   | 70 ----------------------
 databases/mongodb50/files/patch-boost-179-link-fix | 21 -------
 3 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 356e4e3d1739..59b37c568bfc 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -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
diff --git a/databases/mongodb50/files/patch-boost-179-compat b/databases/mongodb50/files/patch-boost-179-compat
deleted file mode 100644
index 8135db48dd3c..000000000000
--- a/databases/mongodb50/files/patch-boost-179-compat
+++ /dev/null
@@ -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>
diff --git a/databases/mongodb50/files/patch-boost-179-link-fix b/databases/mongodb50/files/patch-boost-179-link-fix
deleted file mode 100644
index 157ebaaf0221..000000000000
--- a/databases/mongodb50/files/patch-boost-179-link-fix
+++ /dev/null
@@ -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")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301201407.30KE7T4P056440>