From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1D491580E0 for ; Mon, 02 Jun 2025 09:36:51 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A9175343317 for ; Mon, 02 Jun 2025 09:36:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4CEDA1104F9; Mon, 02 Jun 2025 09:34:32 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 2E3131104FB for ; Mon, 02 Jun 2025 09:34:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D53C1343142 for ; Mon, 02 Jun 2025 09:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F383291F for ; Mon, 02 Jun 2025 09:34:28 +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: <1748856136.4b1ef8d3cb7847ac65739560591d9cd26af33e86.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.85.0-r2 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.75.0-handle-vendored-sources.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 4b1ef8d3cb7847ac65739560591d9cd26af33e86 X-VCS-Branch: 1.85.0-r2 Date: Mon, 02 Jun 2025 09:34:28 +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: 719a89b9-193a-4756-8c26-1cad0482d24b X-Archives-Hash: a446af3490f6fc66c1f70f194075d10c Message-ID: <20250602093428.yaVSsjg7WWzEyyj1-nNWE6XWO5S8FWzHwJI2F9khsBA@z> commit: 4b1ef8d3cb7847ac65739560591d9cd26af33e86 Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 2 09:22:16 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 2 09:22:16 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=4b1ef8d3 Add patches for Rust 1.77.1-r101 Patches: - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.75.0-musl-dynamic-linking.patch - 1.76.0-loong-code-model.patch Signed-off-by: Matt Jolly gentoo.org> 1.75.0-handle-vendored-sources.patch | 39 ------------------------------------ 1 file changed, 39 deletions(-) diff --git a/1.75.0-handle-vendored-sources.patch b/1.75.0-handle-vendored-sources.patch deleted file mode 100644 index 5d39022..0000000 --- a/1.75.0-handle-vendored-sources.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4b7e0a0b56aa2446e670dfd6558380a1039a86aa Mon Sep 17 00:00:00 2001 -From: Arlo Siemsen -Date: Thu, 4 Jan 2024 11:40:56 -0600 -Subject: [PATCH] Handle vendored sources when remapping paths - -Signed-off-by: Randy Barlow ---- a/src/bootstrap/src/core/builder.rs -+++ b/src/bootstrap/src/core/builder.rs -@@ -1799,15 +1799,20 @@ pub fn cargo( - } - - if self.config.rust_remap_debuginfo { -- // FIXME: handle vendored sources -- let registry_src = t!(home::cargo_home()).join("registry").join("src"); - let mut env_var = OsString::new(); -- for entry in t!(std::fs::read_dir(registry_src)) { -- if !env_var.is_empty() { -- env_var.push("\t"); -- } -- env_var.push(t!(entry).path()); -+ if self.config.vendor { -+ let vendor = self.build.src.join("vendor"); -+ env_var.push(vendor); - env_var.push("=/rust/deps"); -+ } else { -+ let registry_src = t!(home::cargo_home()).join("registry").join("src"); -+ for entry in t!(std::fs::read_dir(registry_src)) { -+ if !env_var.is_empty() { -+ env_var.push("\t"); -+ } -+ env_var.push(t!(entry).path()); -+ env_var.push("=/rust/deps"); -+ } - } - cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); - } --- -2.43.0 -