From owner-dev-commits-ports-main@freebsd.org Wed Sep 22 07:55:38 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 112E06ADA13; Wed, 22 Sep 2021 07:55:38 +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 4HDrFP6F1zz4XC8; Wed, 22 Sep 2021 07:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B50DB140A5; Wed, 22 Sep 2021 07:55:37 +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 18M7tbw6098578; Wed, 22 Sep 2021 07:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M7tbAU098577; Wed, 22 Sep 2021 07:55:37 GMT (envelope-from git) Date: Wed, 22 Sep 2021 07:55:37 GMT Message-Id: <202109220755.18M7tbAU098577@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 3cd9974edbf6 - main - databases/mongodb42: Update to 4.2.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cd9974edbf6f82bae14a9c61fe65088f38fb35a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 07:55:38 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=3cd9974edbf6f82bae14a9c61fe65088f38fb35a commit 3cd9974edbf6f82bae14a9c61fe65088f38fb35a Author: Ronald Klop AuthorDate: 2021-09-22 07:54:13 +0000 Commit: Li-Wen Hsu CommitDate: 2021-09-22 07:54:13 +0000 databases/mongodb42: Update to 4.2.16 - register conflict with mongodb50 - enable outline-atomics (needs >= 1400033; FreeBSD 11/12/13 do not try to enable it) https://docs.mongodb.com/manual/release-notes/4.2-changelog/#4.2.16-changelog PR: 258455 --- databases/mongodb42/Makefile | 10 ++++++++-- databases/mongodb42/distinfo | 6 +++--- databases/mongodb42/files/patch-SConstruct | 10 ---------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile index 2e91c1936951..e2a5d99ea132 100644 --- a/databases/mongodb42/Makefile +++ b/databases/mongodb42/Makefile @@ -1,6 +1,6 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 4.2.15 +DISTVERSION= 4.2.16 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ @@ -32,7 +32,7 @@ USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix USE_RC_SUBR= mongod CONFLICTS_BUILD= mongo-cxx-driver -CONFLICTS_INSTALL= mongodb36 mongodb4[04] +CONFLICTS_INSTALL= mongodb36 mongodb4[04] mongodb50 OPTIONS_DEFINE= LTO SASL SSL OPTIONS_DEFAULT=LTO SASL SSL @@ -41,6 +41,7 @@ OPTIONS_EXCLUDE_aarch64_14= LTO # Does not work with llvm12 on aarch64. SHEBANG_FILES= src/mongo/installer/compass/install_compass python_OLD_CMD= @python_interpreter@ + MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ --use-system-zlib \ --use-system-pcre \ @@ -68,6 +69,11 @@ SSL_MAKE_ARGS= --ssl .include +.if ${OPSYS} == FreeBSD && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \ + && ${ARCH} == "aarch64") +BROKEN= Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else diff --git a/databases/mongodb42/distinfo b/databases/mongodb42/distinfo index 565217003185..6ea9c771935b 100644 --- a/databases/mongodb42/distinfo +++ b/databases/mongodb42/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626038087 -SHA256 (mongodb-src-r4.2.15.tar.gz) = 22f704dd35c0abe182cfd244ce08f43783c1ece6be23e47a6f1872798c312deb -SIZE (mongodb-src-r4.2.15.tar.gz) = 62187847 +TIMESTAMP = 1631386367 +SHA256 (mongodb-src-r4.2.16.tar.gz) = d7509aea31b3df2c9e1c3aa4b0ad4aa752f6bdab7fd4efadd4d0291377977bca +SIZE (mongodb-src-r4.2.16.tar.gz) = 62206525 diff --git a/databases/mongodb42/files/patch-SConstruct b/databases/mongodb42/files/patch-SConstruct index 47fc2da88d30..1fdba0cc4cd7 100644 --- a/databases/mongodb42/files/patch-SConstruct +++ b/databases/mongodb42/files/patch-SConstruct @@ -31,13 +31,3 @@ if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) -@@ -3627,7 +3627,8 @@ def doConfigure(myenv): - myenv = conf.Finish() - - if env['TARGET_ARCH'] == "aarch64": -- AddToCCFLAGSIfSupported(myenv, "-moutline-atomics") -+ # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html -+ AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics") - - return myenv -