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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE5701581F2 for ; Wed, 11 Dec 2024 09:51:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E3F0E0A5D; Wed, 11 Dec 2024 09:51:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3084EE0A5D for ; Wed, 11 Dec 2024 09:51:25 +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 5A28F33BEA5 for ; Wed, 11 Dec 2024 09:51:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88418EE7 for ; Wed, 11 Dec 2024 09:51:22 +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: <1733910649.20ccbb46873b4a3380962d427aa09483b7b4791e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/files/mongodb-5.0.26-scons.patch dev-db/mongodb/mongodb-5.0.26.ebuild X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 20ccbb46873b4a3380962d427aa09483b7b4791e X-VCS-Branch: master Date: Wed, 11 Dec 2024 09:51:22 +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: 5d112e1f-61b4-4c5b-8d8a-5588aa3a4995 X-Archives-Hash: 0cd8589bc083894cc9ad2c53ad2a641f commit: 20ccbb46873b4a3380962d427aa09483b7b4791e Author: Z. Liu gmail com> AuthorDate: Thu Sep 5 03:51:10 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 11 09:50:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ccbb46 dev-db/mongodb: add PATH to Environment, otherwise build failed w/ clang Closes: https://bugs.gentoo.org/829340 Signed-off-by: Z. Liu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38444 Signed-off-by: Sam James gentoo.org> dev-db/mongodb/files/mongodb-5.0.26-scons.patch | 27 +++++++++++++++++++++++++ dev-db/mongodb/mongodb-5.0.26.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-db/mongodb/files/mongodb-5.0.26-scons.patch b/dev-db/mongodb/files/mongodb-5.0.26-scons.patch new file mode 100644 index 000000000000..2bb9c527ab2d --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.26-scons.patch @@ -0,0 +1,27 @@ +https://jira.mongodb.org/browse/SERVER-94430 Upstream respond: + +> we intentionally do not ingest the environment PATH as this makes build +> reproducibility and hermiticity much harder. Instead, you should set the +> absolute paths to the tools you want to use on the command line, instead of +> relying on the PATH. + +Gentoo bug https://bugs.gentoo.org/829340 + +In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or +whatever), not in /usr/bin, and if upstream strip PATH and construct it +themselves, they surely won't contain this location. + +So we add PATH backup for scons. +diff --git a/SConstruct b/SConstruct +index 3d831c9..f07feeb 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1201,7 +1201,7 @@ envDict = dict(BUILD_ROOT=buildDir, + if get_option('build-tools') == 'next': + SCons.Tool.DefaultToolpath.insert(0, os.path.abspath('site_scons/site_tools/next')) + +-env = Environment(variables=env_vars, **envDict) ++env = Environment(variables=env_vars, ENV={'PATH': os.environ['PATH']}, **envDict) + del envDict + + if get_option('cache-signature-mode') == 'validate': diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild index ae30891c4a94..63bff8b4aa91 100644 --- a/dev-db/mongodb/mongodb-5.0.26.ebuild +++ b/dev-db/mongodb/mongodb-5.0.26.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.29-no-enterprise.patch" "${FILESDIR}/${PN}-5.0.26-boost-1.85.patch" "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch" + "${FILESDIR}/${PN}-5.0.26-scons.patch" ) python_check_deps() {