From 2eceaa4b6ca398ec233b18c1064970bdf68a9258 Mon Sep 17 00:00:00 2001 From: Sundeep KOKKONDA Date: Fri, 8 Mar 2024 07:37:07 -0800 Subject: [PATCH] rust: reproducibility issue fix with v1.75 Patch updated with upstream fix. https://github.com/rust-lang/rust/pull/121959/commits/a9a979839bbdfec48c75d618ab0dce8a953589b8 Signed-off-by: Sundeep KOKKONDA Signed-off-by: Richard Purdie --- .../files/repro-issue-fix-with-v175.patch | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch b/meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch index 6840bafff8c..fe0507c981e 100644 --- a/meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch +++ b/meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch @@ -1,23 +1,36 @@ rust: reproducibility issue fix with v1.75 -With 1.75 rust release, the '.rustc' section of shared object libs are embedded with absolute path names which is casuing reproducibiluty issues. +With 1.75 rust release, the '.rustc' section of shared object libs are embedded with absolute path names which is casuing reproducibility issues. This change will fix the path name format back to '/rust/$hash' as in earlier versions. Below are the links for detailed bug description & discusssion with upstream rust. https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 -Upstream-Status: Inappropriate [patches need rework] +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/121959/commits/a9a979839bbdfec48c75d618ab0dce8a953589b8] Signed-off-by: Sundeep KOKKONDA --- ---- a/compiler/rustc_session/src/session.rs 2023-12-21 08:55:28.000000000 -0800 -+++ b/compiler/rustc_session/src/session.rs 2024-02-26 07:29:15.527577022 -0800 -@@ -1269,7 +1269,7 @@ - | CrateType::Rlib - | CrateType::Staticlib - | CrateType::Cdylib => continue, +--- a/compiler/rustc_session/src/session.rs 2023-12-21 08:55:28.000000000 -0800 ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 07:29:15.527577022 -0800 +@@ -1260,19 +1260,6 @@ + } + + pub fn should_prefer_remapped_for_codegen(&self) -> bool { +- // bail out, if any of the requested crate types aren't: +- // "compiled executables or libraries" +- for crate_type in &self.opts.crate_types { +- match crate_type { +- CrateType::Executable +- | CrateType::Dylib +- | CrateType::Rlib +- | CrateType::Staticlib +- | CrateType::Cdylib => continue, - CrateType::ProcMacro => return false, -+ CrateType::ProcMacro => return true, - } - } - +- } +- } +- + let has_split_debuginfo = match self.split_debuginfo() { + SplitDebuginfo::Off => false, + SplitDebuginfo::Packed => true, + + -- 2.47.3