From 999aa349928e4a0ca19a4b8990d6f61d7257c121 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 17 Apr 2024 15:43:56 +0900 Subject: [PATCH] dev-lang/rust: Drop alternative patch The patch https://github.com/rust-lang/rust/pull/119582 got merged some releases ago as alternative to the patch https://github.com/rust-lang/rust/pull/119445 we included in the ebuild file. We currently use both because the unneeded patch got changed to apply again but it's not needed and may cause strange behavior. Therefore, drop the alternative patch. --- .../dev-lang/rust/files/1.77.0-119445.patch | 84 ------------------- .../dev-lang/rust/rust-1.77.1.ebuild | 1 - 2 files changed, 85 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch deleted file mode 100644 index e5db790c888..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a4132f6d092b781b742679d2229c1c69f6ad7b16 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Sat, 30 Dec 2023 15:13:27 +0000 -Subject: [PATCH 1/2] Handle non-existent/empty /registry/src - -If remap-debuginfo is set but cargo isn't vendored into -.cargo/registry/src, don't panic: - -| thread 'main' panicked at src/core/builder.rs:1795:26: -| std::fs::read_dir(registry_src) failed with No such file or directory (os error 2) - -Signed-off-by: Alex Kiernan ---- - src/bootstrap/src/core/builder.rs | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs -index e85753a351232..08e7e0b348096 100644 ---- a/src/bootstrap/src/core/builder.rs -+++ b/src/bootstrap/src/core/builder.rs -@@ -1805,15 +1805,19 @@ pub fn cargo( - 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"); -+ if registry_src.is_dir() { -+ 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"); - } -- env_var.push(t!(entry).path()); -- env_var.push("=/rust/deps"); - } - } -- cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); -+ if !env_var.is_empty() { -+ cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); -+ } - } - - // Enable usage of unstable features -From 361f32e60788bb95011092a9b2a0472d4e6d38b1 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Sat, 30 Dec 2023 15:15:40 +0000 -Subject: [PATCH 2/2] Ignore blank - RUSTC_DEBUGINFO_MAP/RUSTC_CARGO_REGISTRY_SRC_TO_REMAP - -If RUSTC_DEBUGINFO_MAP or RUSTC_CARGO_REGISTRY_SRC_TO_REMAP are empty, -avoid inserting `--remap-path-prefix` with no associated argument. - -Signed-off-by: Alex Kiernan ---- - src/bootstrap/src/bin/rustc.rs | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/bootstrap/src/bin/rustc.rs b/src/bootstrap/src/bin/rustc.rs -index 38c55b2034496..a9dd687b75653 100644 ---- a/src/bootstrap/src/bin/rustc.rs -+++ b/src/bootstrap/src/bin/rustc.rs -@@ -161,13 +161,17 @@ fn main() { - } - - if let Ok(map) = env::var("RUSTC_DEBUGINFO_MAP") { -- cmd.arg("--remap-path-prefix").arg(&map); -+ if !map.is_empty() { -+ cmd.arg("--remap-path-prefix").arg(&map); -+ } - } - // The remap flags for Cargo registry sources need to be passed after the remapping for the - // Rust source code directory, to handle cases when $CARGO_HOME is inside the source directory. - if let Ok(maps) = env::var("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP") { - for map in maps.split('\t') { -- cmd.arg("--remap-path-prefix").arg(map); -+ if !map.is_empty() { -+ cmd.arg("--remap-path-prefix").arg(map); -+ } - } - } - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.1.ebuild index 0af6837b5a7..f05ca25569e 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.1.ebuild @@ -170,7 +170,6 @@ PATCHES=( "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch #"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch # Only used by upstream Gentoo, fails for 1.75 "${FILESDIR}"/1.67.0-doc-wasm.patch - "${FILESDIR}"/1.77.0-119445.patch ) S="${WORKDIR}/${MY_P}-src"