From nobody Sat Dec 14 16:26:31 2024 X-Original-To: dev-commits-ports-all@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 4Y9Wml6Knmz5gRCZ; Sat, 14 Dec 2024 16:26:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Wml5mLHz56DM; Sat, 14 Dec 2024 16:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734193591; 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=7ULuerkh/vIoV33uzemx38aT0CkEa8lXkshRivBy84Y=; b=J5hwuBdalOmZjPuqeGHZ4d+YqOoSaR2Zs0y9yo9ies7NbSdBLdml+BRLqGHaetJmvT54AD DtLMGmXB7LjJMfEZxhktudDfYWs7yTXgiEPW+Yv2nsOP/6tqdgHdTMMHVsb7/GgEgN+s9Y YpBwbdNtcirVAy5hPOZi0+kcy7o33oGxFGldExxq5EAThsAcsDqAmesrKFKr/DOWx7F/+3 GMvT91Y7pWt2EHqQ+mONC3WcLGAG31Q1qp9tbKt209bdMLF+jn6TfwIxbI4W5I+8g6AqgC VHPalSDFSLSdNGc+KkkSVtRVqFB7bx9/W2GdoqBLOEsHHHjtqiM3u0Wo+GMdqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734193591; 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=7ULuerkh/vIoV33uzemx38aT0CkEa8lXkshRivBy84Y=; b=oz8SEjNwzDOz9Ylk2xqCXH5/hjHWbDR+5gil2xTE8EJuTygUN8jTM8vcvdUkK0Dw2xZYZm TI3N84c8KPWTytKwQ4Q3KyDuTyHNr/NXLn5SsDE3jxpkU39W+ZaiWlD8v9mhJuAjIL/UDR 7xB8cSa8M8WAVtDvt5T6pAZ2C6YgV9VMy1dMKgt/e9XT/42qv4OzANZC9/LzVSeMpiNAop RLRxQBA/PcyGmg2nBeR9c5zE/iscXUN5bcs7/pPm2OAh99JezsqVVw3c7ZCeEUoTA7AUlG b8T9L6yrjTmP5ItLHUu3AWp6hCY8p1PPuF4fmlJay3qkbshvTcw6mhVmJu7/zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734193591; a=rsa-sha256; cv=none; b=raXRy8gessL/dbm94beHsHom5OQzttOCFlG+rfByw5+LZd3uesRWE/zKNFdqx9dA5Xnij4 W9MVI4pmvuS3t6ryXADA1Kjp9J8LFuaVM+kr+Q9RHoInEPRxxJCT8iz7mjHtHYeG0y94Wf +iWiXA6fKyOhGKWWVlg6EJVmSf82FWKYY70iQ+g7E84qOmbiLVFKaD7Ve2hzVxwcWwp0d6 FroQpxaGiiLHQx/8MpfKGaBpgjQH3jjF6DqeK+pgm2fpY2KT+ydEb998ZOMKWRPFwffvg+ CUk8Nx5t1HaDnV5XgFGhuG0B0NAeBfApzEuwtBX82SBInkX29BYSEtpFafMNTQ== 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 4Y9Wml52mKzWCx; Sat, 14 Dec 2024 16:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BEGQVtp073938; Sat, 14 Dec 2024 16:26:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEGQVGb073935; Sat, 14 Dec 2024 16:26:31 GMT (envelope-from git) Date: Sat, 14 Dec 2024 16:26:31 GMT Message-Id: <202412141626.4BEGQVGb073935@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: 4df468324acd - main - databases/mongodb80: fix build with llvm19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 4df468324acd2d51439b16ff8d626e77580f1b6c Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=4df468324acd2d51439b16ff8d626e77580f1b6c commit 4df468324acd2d51439b16ff8d626e77580f1b6c Author: Ronald Klop AuthorDate: 2024-12-11 08:30:11 +0000 Commit: Ronald Klop CommitDate: 2024-12-14 16:25:31 +0000 databases/mongodb80: fix build with llvm19 Build with clang from base. Uses 2 public patches. Documentation is in the patches themselves. --- databases/mongodb80/Makefile | 14 ++++++++------ databases/mongodb80/distinfo | 4 +++- ...atch-src_third__party_boost_boost_thread_future.hpp | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/databases/mongodb80/Makefile b/databases/mongodb80/Makefile index c249c4c9136a..78c5ebc57b3d 100644 --- a/databases/mongodb80/Makefile +++ b/databases/mongodb80/Makefile @@ -1,8 +1,13 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 8.0.4 +PORTREVISION= 1 CATEGORIES= databases net +MASTER_SITES= https://hg.mozilla.org/mozilla-central/raw-rev/:patches PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} +DISTFILES= 223087fdc29f18678f6174e9807b8780e439acf6:patches # https://bugzilla.mozilla.org/1894423 +EXTRACT_ONLY= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}_GH0.tar.gz \ + ${GH_ACCOUNT}-forks-spidermonkey-${MOZJS_TAG}_GH0.tar.gz MAINTAINER= ronald@FreeBSD.org COMMENT= MongoDB Community Edition (8.0.x Branch) @@ -111,12 +116,6 @@ NOAVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript \ SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500026 # llvm 19.1.2 import -USES+= llvm:max=18,build -.endif - .include ALL_TARGET= install-servers @@ -135,6 +134,9 @@ MOZJS_ARCH= ppc64le MOZJS_ARCH= ${ARCH} .endif +post-patch: + ${PATCH} -d ${WRKSRC}/src/third_party/mozjs/extract --quiet -p1 -V none < ${DISTDIR}/223087fdc29f18678f6174e9807b8780e439acf6 + pre-configure: # Verify we downloaded the proper mozjs git tag. ${SH} -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\"" diff --git a/databases/mongodb80/distinfo b/databases/mongodb80/distinfo index 673f662a8e79..60ac7f4b73cd 100644 --- a/databases/mongodb80/distinfo +++ b/databases/mongodb80/distinfo @@ -1,4 +1,6 @@ -TIMESTAMP = 1732871587 +TIMESTAMP = 1733047625 +SHA256 (223087fdc29f18678f6174e9807b8780e439acf6) = f234371584e2b2bc9953ae4fd145da19c99a6f04087f53d59616aecf29df039c +SIZE (223087fdc29f18678f6174e9807b8780e439acf6) = 1597 SHA256 (mongodb-mongo-r8.0.4_GH0.tar.gz) = 1fa8bb002983580fd3668099ce218778a294d864db4d3721fffc6782bea6ba2c SIZE (mongodb-mongo-r8.0.4_GH0.tar.gz) = 94649995 SHA256 (mongodb-forks-spidermonkey-bb6edb4fcd43607c87de81df8c58db11a663634a_GH0.tar.gz) = 8b237164cb3f492aa1658080b91bafb3c98fe72da11ffb65513e4bffe01553f9 diff --git a/databases/mongodb80/files/patch-src_third__party_boost_boost_thread_future.hpp b/databases/mongodb80/files/patch-src_third__party_boost_boost_thread_future.hpp new file mode 100644 index 000000000000..cf4ad80ef93d --- /dev/null +++ b/databases/mongodb80/files/patch-src_third__party_boost_boost_thread_future.hpp @@ -0,0 +1,18 @@ +https://github.com/boostorg/thread/issues/402 + +In file included from src/third_party/boost/libs/thread/src/pthread/thread.cpp:19: +src/third_party/boost/boost/thread/future.hpp:4672:19: error: no member named 'that' in 'run_it'; did you mean 'that_'? + 4672 | that_=x.that; + | ^~~~ + +--- src/third_party/boost/boost/thread/future.hpp.orig 2024-12-12 08:36:29 UTC ++++ src/third_party/boost/boost/thread/future.hpp +@@ -4669,7 +4669,7 @@ namespace detail + } + run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT { + if (this != &x) { +- that_=x.that; ++ that_=x.that_; + x.that_.reset(); + } + return *this;