From nobody Wed Jul 05 10:36:42 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 4Qwx0p38Fjz4lb7D; Wed, 5 Jul 2023 10:36:42 +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 4Qwx0p2GYyz3Pck; Wed, 5 Jul 2023 10:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688553402; 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=CxRa0omuJbJrzNpLkNnzr/XQb6uIxgNoqPSAlbuEg9M=; b=H0jynzwbAAW597YY/eWsw2pRfto78WRuI+g6FEA65Qj8t78VCFLl7KpotOXKfl3uKsP6NT +Q1Y8MH2UrwEc46zkmlOK6iirbnxXk4UsdGTw+E/3UNwEb/lbgI4gonrmYfh5JghoFIk/I MaEYb3vJccF8ieH4nHq85k9NiAUG/HZJzJsAc75y3/mFQsImUTvgbxeVNmG4VQdnbkxeEY yOUpZiB7dYO0w8wY9N0Gh+dtq4V0hIunIDZvdyYRwORl01beajcTgHbMwOvFXdub/nsleQ MH3Dm2NWaENUXQ8XThK4m9c/JXzE6zXSQyyjGLw9qqhKICQDG1FXrL5EhhMiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688553402; 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=CxRa0omuJbJrzNpLkNnzr/XQb6uIxgNoqPSAlbuEg9M=; b=F1m3C+RH9lCsqYEAGOL3ixeVZro+WWI4hJ20r/ipX6mPA5A2668EAl00ZAPg+k18XR+dLs RHuJ9aqEOVYLbqRdHSd+ogBmlWTbjMKznjRcd6mDiCZ/uZqK6o6j2/qgcJWBjzkFL34Kf9 2m8an09A8Kr+9Lmz15OAxviG+fJ/wqjK9nPxUQdegesLxld68pSWvek4Y2hE3evWFt3WNT dsIcjBuWHCXRh9n1QeU1zfPgEKDbhTQTbzZtPmAVhnjC22FVL+MWgS/gCLtTeIrSinbCqZ 3b+jBKyO4XDDApReZo7OE5S/bRVcli4L9pJQ+dRFwwYk8YCZ6iNeNxNMJsWd0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688553402; a=rsa-sha256; cv=none; b=e51JAKWOxD8BI7uyroUIb9Yee+c5ZLjliVIo2JZ6DzQAJZM4yxO4y8kTSo9LydVZ4/8jLQ vu3zilqYi61aTXMI/OLSZd7X9RRRdYCRikFPKAIqGu0Yd5JsG4t4W2kJHF/Zl89J0Wszy/ JHg2Oii5eKY1l4JAmLfDmXd34YPkJSegwSqPxdprGGVxqevio4+tlDApER/8xeKYgJyez5 iuiboxISttMSQsy7EJ7qX3Fm2JmYtgPV32AH1fQlMJPZhh/zXhjmjQvJ6zUn2KTTvyEY+i kEBDXOo8+yzYDQmdyFD5o3Wr1C290arEX+1XJH+TNiwS5JeJN0jaz5XLmHvHLw== 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 4Qwx0p1LMXz1BSt; Wed, 5 Jul 2023 10:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365AagYt022697; Wed, 5 Jul 2023 10:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365AagIu022696; Wed, 5 Jul 2023 10:36:42 GMT (envelope-from git) Date: Wed, 5 Jul 2023 10:36:42 GMT Message-Id: <202307051036.365AagIu022696@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: 4426adf7a80a - main - databases/mongodb42: fix build with llvm16/clang16 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: 4426adf7a80a9344a9f755a2ca66e668ec7a1720 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=4426adf7a80a9344a9f755a2ca66e668ec7a1720 commit 4426adf7a80a9344a9f755a2ca66e668ec7a1720 Author: Ronald Klop AuthorDate: 2023-07-05 10:34:56 +0000 Commit: Ronald Klop CommitDate: 2023-07-05 10:36:29 +0000 databases/mongodb42: fix build with llvm16/clang16 Similar fix as mongodb44. --- databases/mongodb42/Makefile | 2 ++ ...__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile index 96d417f4b831..d5df687f88b5 100644 --- a/databases/mongodb42/Makefile +++ b/databases/mongodb42/Makefile @@ -36,6 +36,8 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ USES= compiler:c++17-lang cpe python:build scons shebangfix USE_RC_SUBR= mongod +CFLAGS+= -D_HAS_AUTO_PTR_ETC=0 + CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample OPTIONS_DEFINE= LTO SASL SSL diff --git a/databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp new file mode 100644 index 000000000000..fc5562f61763 --- /dev/null +++ b/databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp @@ -0,0 +1,11 @@ +--- src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp.orig 2023-06-29 10:06:20 UTC ++++ src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp +@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME + // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), + // while some other don't like 'value + 1' (Borland), and some don't like + // either +-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) ++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243) + private: + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));