]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rust: reproducibility issue fix with v1.75
authorYash Shinde <Yash.Shinde@windriver.com>
Thu, 29 Feb 2024 16:32:42 +0000 (08:32 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 1 Mar 2024 09:30:39 +0000 (09:30 +0000)
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

Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com>
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch [new file with mode: 0644]
meta/recipes-devtools/rust/rust-source.inc

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 (file)
index 0000000..6840baf
--- /dev/null
@@ -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 <sundeep.kokkonda@windriver.com>
+---
+--- 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,
+             }
+         }
index 8ae8add4956a0cd431c3281e16aae1df01bb4522..6bef99039d2a9fe1a75891783447278b7b3e9372 100644 (file)
@@ -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"