[gentoo-commits] repo/gentoo:master commit in: eclass/

["Matt Jolly" <kangie@gentoo.org>]

commit:     34b74faa06a90bf9d4f62ecfca746b380d60517a
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 03:07:51 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 09:07:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b74faa

rust.eclass: revert simplified dependency simplification

The simplified dependency specification for cases where no RUST_MAX_SLOT
is set is the desired end state, however the edge case where portage
drops blockers with `--keep-going` has an unfortunate interaction where
both packages are installed simultaneously, e.g. dev-lang/rust-1.82.0:stable
and dev-lang/rust-1.82.0:1.82.0, and there's no easy way for end users
to resolve that as the legacy (though masked) ebuilds will meet the simple
Rust dependency.

Both packages install rlibs with different hashes in them to the same
path (as shown below) resulting in failures when a package attempts
to link against an rlib and finds two.

1.82.0:      .../x86_64-unknown-linux-gnu/lib/libunwind-fc4fe814489209c6.rlib
1.82.0-r100: .../x86_64-unknown-linux-gnu/lib/libunwind-ab65e6747cbe4a5a.rlib

Bug: https://bugs.gentoo.org/943143
Bug: https://bugs.gentoo.org/943206
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 eclass/rust.eclass | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index 3837c3a1f6c5..3a8a93718787 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -196,25 +196,22 @@ _rust_set_globals() {
 	local usedep="${RUST_REQ_USE+[${RUST_REQ_USE}]}"
 
 	# If we're not using LLVM, we can just generate a simple Rust dependency
+	# In time we need to implement trivial dependencies
+	# (>=RUST_MIN_VER) where RUST_MAX_VER isnt't set,
+	# however the previous attempt to do this ran into issues
+	# where `emerge ... --keep-going` ate legacy non-slotted
+	# Rust blockers resutling in the non-slotted version never
+	# being removed and breaking builds. #943206 #943143
 	if [[ -z "${RUST_NEEDS_LLVM}" ]]; then
 		rust_dep=( "|| (" )
-		# We can be more flexible if we generate a simpler, open-ended dependency
-		# when we don't have a max version set.
-		if [[ -z "${RUST_MAX_VER}" ]]; then
+		# depend on each slot between RUST_MIN_VER and RUST_MAX_VER; it's a bit specific but
+		# won't hurt as we only ever add newer Rust slots.
+		for slot in "${_RUST_SLOTS[@]}"; do
 			rust_dep+=(
-				">=dev-lang/rust-bin-${RUST_MIN_VER}:*${usedep}"
-				">=dev-lang/rust-${RUST_MIN_VER}:*${usedep}"
+				"dev-lang/rust-bin:${slot}${usedep}"
+				"dev-lang/rust:${slot}${usedep}"
 			)
-		else
-			# depend on each slot between RUST_MIN_VER and RUST_MAX_VER; it's a bit specific but
-			# won't hurt as we only ever add newer Rust slots.
-			for slot in "${_RUST_SLOTS[@]}"; do
-				rust_dep+=(
-					"dev-lang/rust-bin:${slot}${usedep}"
-					"dev-lang/rust:${slot}${usedep}"
-				)
-			done
-		fi
+		done
 		rust_dep+=( ")" )
 		RUST_DEPEND="${rust_dep[*]}"
 	else