From 99c4e7f640f564631eeb07e20f91e55eb99e0afc Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 26 Mar 2024 09:24:02 +0100 Subject: [PATCH] dev-lang/rust: fix build failure of patch 119445 Adjust the patch 119445 for Rust 1.77.0, to fix build failure started to happen with >= 1.77.0 --- ....75.0-119445.patch => 1.77.0-119445.patch} | 41 +++++++++---------- .../dev-lang/rust/rust-1.77.0.ebuild | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/{1.75.0-119445.patch => 1.77.0-119445.patch} (71%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.75.0-119445.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.75.0-119445.patch rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch index 76097af861..e5db790c88 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.75.0-119445.patch +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch @@ -18,33 +18,32 @@ diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder. index e85753a351232..08e7e0b348096 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs -@@ -1812,15 +1812,19 @@ impl<'a> Builder<'a> { - 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 registry_src.is_dir() { -+ 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()); -+ env_var.push("=/rust/deps"); -+ } - if !env_var.is_empty() { -- env_var.push("\t"); -+ cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); +@@ -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"); } -- 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 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.0.ebuild index 6a13905a1b..0af6837b5a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.0.ebuild @@ -170,7 +170,7 @@ 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.75.0-119445.patch + "${FILESDIR}"/1.77.0-119445.patch ) S="${WORKDIR}/${MY_P}-src"