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 292E315852A for ; Tue, 20 Aug 2024 08:31:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C504E29E9; Tue, 20 Aug 2024 08:31:50 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C7CFE29E9 for ; Tue, 20 Aug 2024 08:31:50 +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 638FE3409C8 for ; Tue, 20 Aug 2024 08:31:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2D9F1EFD for ; Tue, 20 Aug 2024 08:31:47 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1724142705.dbb73d2c2716f419f1fe3c320c79ae3f97b1ac45.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/23.12.1/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch app-misc/anki/files/23.12.1/use-system-nextest.patch X-VCS-Directories: app-misc/anki/files/23.12.1/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: dbb73d2c2716f419f1fe3c320c79ae3f97b1ac45 X-VCS-Branch: master Date: Tue, 20 Aug 2024 08:31:47 +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: 3371a21b-a6cc-4e5e-899f-6b64e5bac076 X-Archives-Hash: 51d50e635c08a88fb727b6f8bd0488b0 commit: dbb73d2c2716f419f1fe3c320c79ae3f97b1ac45 Author: Lucio Sauer posteo net> AuthorDate: Wed Aug 7 13:05:00 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 20 08:31:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb73d2c app-misc/anki: ensure build runner and configure are built for CBUILD These changes have not yet been tested in an actual cross environment but since the build system respects Cargo environment variables, this should hopefully work. Bump the revision of this ebuild because the build now honors LDFLAGS among other RUSTFLAGS set in cargo_env in the cargo eclass. Signed-off-by: Lucio Sauer posteo.net> Signed-off-by: Joonas Niilola gentoo.org> ...ystem-nextest.patch => ninja-rules-for-cargo.patch} | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app-misc/anki/files/23.12.1/use-system-nextest.patch b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch similarity index 50% rename from app-misc/anki/files/23.12.1/use-system-nextest.patch rename to app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch index 8f931b97da86..cf9356bbc24c 100644 --- a/app-misc/anki/files/23.12.1/use-system-nextest.patch +++ b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch @@ -1,10 +1,24 @@ -Provide the binary ourselves to prevent network access. +Fix the output path for Rust binaries in the Ninja file to match +Cargo's target directory when CARGO_BUILD_TARGET is set. This prevents +file-not-found errors for some build steps. + +Provide the cargo-nextest binary ourselves to prevent network access. Set test runner options in the ebuild. From: Lucio Sauer --- a/build/ninja_gen/src/cargo.rs +++ b/build/ninja_gen/src/cargo.rs -@@ -152,19 +152,11 @@ impl BuildAction for CargoTest { +@@ -61,6 +61,9 @@ impl RustOutput<'_> { + let mut path: Utf8PathBuf = rust_base.into(); + if let Some(target) = target { + path = path.join(target); ++ } else { ++ let triple = std::env::var("CARGO_BUILD_TARGET").unwrap_or_default(); ++ path = path.join(triple); + } + path = path.join(profile_output_dir(build_profile)).join(filename); + path.to_string() +@@ -152,19 +155,11 @@ impl BuildAction for CargoTest { fn files(&mut self, build: &mut impl FilesHandle) { build.add_inputs("", &self.inputs);