summaryrefslogtreecommitdiff
path: root/dev-db/mongodb
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2025-05-06 20:18:51 +0100
committerSam James <sam@gentoo.org>2025-05-06 20:18:51 +0100
commitf9783eb8b574dfab4c9573f411b36e16d6921ffb (patch)
tree21a9a9f70bcf41e8dbce155ebecace9cb6b5233a /dev-db/mongodb
parent25f98c57ed251a6352419c34840a9849e61bfd8b (diff)
downloadgentoo-f9783eb8b574dfab4c9573f411b36e16d6921ffb.tar.gz
gentoo-f9783eb8b574dfab4c9573f411b36e16d6921ffb.tar.bz2
gentoo-f9783eb8b574dfab4c9573f411b36e16d6921ffb.zip
dev-db/mongodb/files: restore PATH commentary in patches
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch19
-rw-r--r--dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch17
-rw-r--r--dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch17
-rw-r--r--dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch17
-rw-r--r--dev-db/mongodb/files/mongodb-8.0.4-scons.patch15
5 files changed, 83 insertions, 2 deletions
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
index 2d1a2f9312bb..f66e52f1c9ed 100644
--- a/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-fix-scons.patch
@@ -1,5 +1,20 @@
-diff --git a/SConstruct b/SConstruct
-index 115de78a..613110b7 100644
+wrt PATH:
+"""
+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.
+"""
--- a/SConstruct
+++ b/SConstruct
@@ -2366,7 +2366,6 @@ if env.TargetOSIs('posix'):
diff --git a/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch b/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
index 26d2b486ac68..8874ad210057 100644
--- a/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
+++ b/dev-db/mongodb/files/mongodb-6.0.2-sconstruct-changes.patch
@@ -1,3 +1,20 @@
+wrt PATH:
+"""
+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 8367691..9061849 100644
--- a/SConstruct
diff --git a/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch b/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch
index 9c7cf21fc0c8..4edcecb40406 100644
--- a/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch
+++ b/dev-db/mongodb/files/mongodb-7.0.1-sconstruct.patch
@@ -1,3 +1,20 @@
+wrt PATH:
+"""
+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 2ebeb0e..44ce93a 100644
--- a/SConstruct
diff --git a/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch b/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch
index 20b1d19bfd27..01f9b232a2ed 100644
--- a/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch
+++ b/dev-db/mongodb/files/mongodb-7.0.2-sconstruct.patch
@@ -1,3 +1,20 @@
+wrt PATH:
+"""
+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/SConstruct2 b/SConstruct
index e9aa2ca..5814f4a 100644
--- a/SConstruct2
diff --git a/dev-db/mongodb/files/mongodb-8.0.4-scons.patch b/dev-db/mongodb/files/mongodb-8.0.4-scons.patch
index 9edf80d44861..3536cdf907aa 100644
--- a/dev-db/mongodb/files/mongodb-8.0.4-scons.patch
+++ b/dev-db/mongodb/files/mongodb-8.0.4-scons.patch
@@ -3,6 +3,21 @@ From: =?UTF-8?q?Fran=C3=A7ois=20Valenduc?= <francoisvalenduc@gmail.com>
Date: Mon, 28 Apr 2025 13:46:34 +0200
Subject: [PATCH] add PATH backup for scons
+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.
+
---
SConstruct | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)