-
Notifications
You must be signed in to change notification settings - Fork 241
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Drop backported musl fixes. * Set `change-id` rather than `changelog-seen` to fix build warning. * Add fixes for 4b7e0a0b56aa24 ("Handle vendored sources when remapping paths") which otherwise cause build failures: | 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) https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html (From OE-Core rev: 469e472431337215ec474980f8f5da1e7260f377) Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Loading branch information
Showing
22 changed files
with
142 additions
and
803 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
163 changes: 0 additions & 163 deletions
163
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
This file was deleted.
Oops, something went wrong.
46 changes: 46 additions & 0 deletions
46
meta/recipes-devtools/rust/files/0001-Handle-vendored-sources-when-remapping-paths.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
From 5e37ea7cb9d99d91f2c5ac6edf19ff777f95bb88 Mon Sep 17 00:00:00 2001 | ||
From: Arlo Siemsen <arsiem@microsoft.com> | ||
Date: Thu, 4 Jan 2024 11:40:56 -0600 | ||
Subject: [PATCH] Handle vendored sources when remapping paths | ||
|
||
Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/119582] | ||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
--- | ||
src/bootstrap/src/core/builder.rs | 19 ++++++++++++------- | ||
1 file changed, 12 insertions(+), 7 deletions(-) | ||
|
||
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs | ||
index cd276674dee6..48fdb2c7f7b7 100644 | ||
--- a/src/bootstrap/src/core/builder.rs | ||
+++ b/src/bootstrap/src/core/builder.rs | ||
@@ -1789,15 +1789,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.39.0 | ||
|
122 changes: 0 additions & 122 deletions
122
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
This file was deleted.
Oops, something went wrong.
41 changes: 0 additions & 41 deletions
41
...cipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.