From nobody Fri Jan 20 14:07:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nz1Xd2mhTz2sdYC; Fri, 20 Jan 2023 14:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nz1Xd2KYcz3rMg; Fri, 20 Jan 2023 14:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674223649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvxxN5v2wy932ZekPbo+kKLcCfQcl6tuH0uu9Woy278=; b=H2aFxMsJ9sICa9VbWPxdCD7cBu4FCR7IWGPWaxg7PTVLgfl4p1vcLmOmJJd0gHPT+GsXrg O1VXOgdjnAY9/bRdF7iRrZFxSIfOrQ0PJbv39zLFS6OD6XTD7vGm0L3hH1VCMWrynrLdtK +l0BoR7MOY4RTb575MNjPyFfD3ilsbOA2qMG7o9XUkTyGBGgPXKvu6qLCQUxJBXNR2b3uY czETWcoGCozh1zix2crwCAnNL/RR0pfJ9V8xcLeu6PFog8lLslMAklVPmSg9WVvCHJCuU6 s+Sm+78/t2m5aT2s00qlE/tAqsijLSkr6xidJpG4LH8NgRn78GspByCYNa1C4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674223649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvxxN5v2wy932ZekPbo+kKLcCfQcl6tuH0uu9Woy278=; b=hpLtLkdTgHSlUxu8vo44HYszOm7jthTLT5xXqeCfyo29g1gbnijxJNAHHVkwkd4Wp6xQ2S 3o94FV7Hhs/3bCNhsPO4FSU5ws9Y7E7D5uZH1cYfTRCyOUWauwVc0UJN3eSbOCUz29RPOO 9vuaQZFK5GX2B1BG1pXl/34PI72JONc0BcBJIg3BCiaMIA3G09c28j/51EtmNcp+dwy607 q6ziFacPfHXUb0f9Wx8Ycq0b7Mb27RlzJSAHoyKbjpLGY9IhGsx2Wh6WaScr24UZHbKaeE r9zneDgT5M+F0rZLSaFeN5bBCK798tN/baX/N1KNWM/iSX2MmLZrQl6AMAN3VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674223649; a=rsa-sha256; cv=none; b=u+xqX7/Hv9372Rt543zufkcTge9GczZ4IsdUJp/8bGuFORFGsTof66NIv265irkv0mmQEf tEW91w30Bb7Jf/iq3JR4dmo0S3jpQryDiEpkam7RDlHXBzGdl7FB2M8RvYO/vDBiNbBz0T TcHqrvKW4d+emoquAK1lPBJvsv5Hfe+b5+sz286s7PmYCKKqNc6Rgz3xRg2LJRz09iKoIH 4YNoWlsKkglj39OHWrLkgcg+2sXA9/1dphEW8982u7g3VC7xgOr411KRldFUyk0lBNdmx8 c3nKF57X20yQKcGH2qQ3uyANx49fekRln7+fFSzufH5m8GwPtY4XmRwBHobeqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nz1Xd15TnzYH1; Fri, 20 Jan 2023 14:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30KE7TM0056441; Fri, 20 Jan 2023 14:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KE7T4P056440; Fri, 20 Jan 2023 14:07:29 GMT (envelope-from git) Date: Fri, 20 Jan 2023 14:07:29 GMT Message-Id: <202301201407.30KE7T4P056440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: d04cd83954fa - main - databases/mongodb50: use in-source boost List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d04cd83954fab0573cd898dfcde840219e34aef2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=d04cd83954fab0573cd898dfcde840219e34aef2 commit d04cd83954fab0573cd898dfcde840219e34aef2 Author: Ronald Klop AuthorDate: 2023-01-20 10:02:11 +0000 Commit: Ronald Klop 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 -+#include - - #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 - #endif - -+#include - #include - - #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 -+#include - #include - #include - ---- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - - #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 -+#include - #include - #include - ---- src/mongo/util/stacktrace_threads.cpp -+++ src/mongo/util/stacktrace_threads.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- src/mongo/util/processinfo_linux.cpp -+++ src/mongo/util/processinfo_linux.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include 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")