From 3970a4888556bde1f893757eae603c9619cfec5f Mon Sep 17 00:00:00 2001 From: Yash Shinde Date: Thu, 29 Feb 2024 08:32:42 -0800 Subject: [PATCH] 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. 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 (From OE-Core rev: a80ce6e3c023809d1ec13d19e8acb25770b54737) Signed-off-by: Sundeep KOKKONDA Signed-off-by: Yash Shinde Signed-off-by: Richard Purdie --- .../files/repro-issue-fix-with-v175.patch | 23 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch 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 new file mode 100644 index 0000000000..6840bafff8 --- /dev/null +++ b/meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch @@ -0,0 +1,23 @@ +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. +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] +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, +- CrateType::ProcMacro => return false, ++ CrateType::ProcMacro => return true, + } + } + diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 8ae8add495..6bef99039d 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -12,6 +12,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ file://target-build-value.patch;patchdir=${RUSTSRC} \ file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} \ + file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340"