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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62AB8158042 for ; Mon, 11 Nov 2024 23:48:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A3B3E07F0; Mon, 11 Nov 2024 23:48:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 2F4DDE07F0 for ; Mon, 11 Nov 2024 23:48:24 +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 1439E33FE49 for ; Mon, 11 Nov 2024 23:48:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EB9F1626 for ; Mon, 11 Nov 2024 23:48:21 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1731368398.7c7e11e46ad664457ccf4954e5bc346c148cff2d.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/rust.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 7c7e11e46ad664457ccf4954e5bc346c148cff2d X-VCS-Branch: master Date: Mon, 11 Nov 2024 23:48:21 +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: 8fa4af00-bc97-42fd-a5e2-5056563f7ad3 X-Archives-Hash: f6c3d4aa2bebae70185afb6fbd00d022 commit: 7c7e11e46ad664457ccf4954e5bc346c148cff2d Author: Matt Jolly gentoo org> AuthorDate: Mon Nov 11 20:50:47 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Nov 11 23:39:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7e11e4 rust.eclass: define `usedep` before its first usage The open-ended dependency (no `RUST_MAX_VER`) was generated before `usedep` was set to anything. Define `usedep` when the variable is initialised and let the `RUST_NEEDS_LLVM` path set it per llvm slot as required. Closes: https://bugs.gentoo.org/943289 Signed-off-by: Matt Jolly gentoo.org> eclass/rust.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eclass/rust.eclass b/eclass/rust.eclass index f7c2d6e9a80e..791af971eb3d 100644 --- a/eclass/rust.eclass +++ b/eclass/rust.eclass @@ -193,7 +193,7 @@ _rust_set_globals() { local rust_dep=() local llvm_slot local rust_slot - local usedep + local usedep="${RUST_REQ_USE+[${RUST_REQ_USE}]}" # If we're not using LLVM, we can just generate a simple Rust dependency if [[ -z "${RUST_NEEDS_LLVM}" ]]; then @@ -209,7 +209,6 @@ _rust_set_globals() { # 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 - usedep="${RUST_REQ_USE+[${RUST_REQ_USE}]}" rust_dep+=( "dev-lang/rust-bin:${slot}${usedep}" "dev-lang/rust:${slot}${usedep}"