From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2D7A15806E for ; Tue, 23 May 2023 13:32:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A113E0921; Tue, 23 May 2023 13:32:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03154E0921 for ; Tue, 23 May 2023 13:32:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBC15340DA4 for ; Tue, 23 May 2023 13:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3766BA68 for ; Tue, 23 May 2023 13:32:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1684848305.20580b5f864c79f89e85244d6312887cbcd9442b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch dev-db/mongodb/mongodb-5.0.16-r1.ebuild X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 20580b5f864c79f89e85244d6312887cbcd9442b X-VCS-Branch: master Date: Tue, 23 May 2023 13:32:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2561852b-79f4-4f0b-9dbc-d9688a3a3bab X-Archives-Hash: 0ea745fa42a9bd8b777b6f15aeeb7fba commit: 20580b5f864c79f89e85244d6312887cbcd9442b Author: Sam James gentoo org> AuthorDate: Tue May 23 13:24:58 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 23 13:25:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20580b5f dev-db/mongodb: fix build w/ arm64+gcc-12 Closes: https://bugs.gentoo.org/855128 Signed-off-by: Sam James gentoo.org> dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch | 16 ++++++++++++++++ dev-db/mongodb/mongodb-5.0.16-r1.ebuild | 1 + 2 files changed, 17 insertions(+) diff --git a/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch new file mode 100644 index 000000000000..6a6b9f14afe0 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.16-arm64-assert.patch @@ -0,0 +1,16 @@ +The upstream patch for this is far too big to backport, so for now, just drop +the assert given it's somewhat harmless compared to not being able to build at all. + +https://jira.mongodb.org/browse/SERVER-65664 +https://bugs.gentoo.org/855128 +--- a/src/mongo/db/stats/counters.h ++++ b/src/mongo/db/stats/counters.h +@@ -221,8 +221,6 @@ private: + AtomicWord requests{0}; + }; + CacheAligned _together{}; +- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, +- "cache line spill"); + + CacheAligned> _logicalBytesOut{0}; + diff --git a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild index a0fc28ebe45c..95e24df12a4f 100644 --- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild +++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" "${FILESDIR}/${PN}-4.4.8-gcc-13.patch" + "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch" ) S="${WORKDIR}/${MY_P}"