mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-13 07:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-lang/rust: fix build failure of patch 119445

Browse Source 
Adjust the patch 119445 for Rust 1.77.0, to fix build failure started
to happen with >= 1.77.0
This commit is contained in:
Dongsu Park 2024-03-26 09:24:02 +01:00
parent 9c1e19f2a6
commit 99c4e7f640
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.75.0-119445.patch → sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.77.0-119445.patch vendored
View File

@ -18,33 +18,32 @@ diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.
index e85753a351232..08e7e0b348096 100644 index e85753a351232..08e7e0b348096 100644
--- a/src/bootstrap/src/core/builder.rs --- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs
@@ -1812,15 +1812,19 @@ impl<'a> Builder<'a> { @@ -1805,15 +1805,19 @@ pub fn cargo(
if self.config.rust_remap_debuginfo { env_var.push("=/rust/deps");
// FIXME: handle vendored sources } else {
let registry_src = t!(home::cargo_home()).join("registry").join("src"); 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)) { - for entry in t!(std::fs::read_dir(registry_src)) {
- if !env_var.is_empty() {
- env_var.push("\t");
+ if registry_src.is_dir() { + if registry_src.is_dir() {
+ let mut env_var = OsString::new();
+ for entry in t!(std::fs::read_dir(registry_src)) { + for entry in t!(std::fs::read_dir(registry_src)) {
+ if !env_var.is_empty() { + if !env_var.is_empty() {
+ env_var.push("\t"); + env_var.push("\t");
+ } + }
+ env_var.push(t!(entry).path()); + env_var.push(t!(entry).path());
+ env_var.push("=/rust/deps"); + env_var.push("=/rust/deps");
+ }
if !env_var.is_empty() {
- env_var.push("\t");
+ cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var);
} }
- env_var.push(t!(entry).path()); - env_var.push(t!(entry).path());
- env_var.push("=/rust/deps"); - env_var.push("=/rust/deps");
} }
}
- cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); - 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 // Enable usage of unstable features
From 361f32e60788bb95011092a9b2a0472d4e6d38b1 Mon Sep 17 00:00:00 2001 From 361f32e60788bb95011092a9b2a0472d4e6d38b1 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com> From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Sat, 30 Dec 2023 15:15:40 +0000 Date: Sat, 30 Dec 2023 15:15:40 +0000

2
sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.77.0.ebuild vendored
View File

@ -170,7 +170,7 @@ PATCHES=(
"${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${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.62.1-musl-dynamic-linking.patch # Only used by upstream Gentoo, fails for 1.75
"${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.67.0-doc-wasm.patch
"${FILESDIR}"/1.75.0-119445.patch "${FILESDIR}"/1.77.0-119445.patch
) )
S="${WORKDIR}/${MY_P}-src" S="${WORKDIR}/${MY_P}-src"