From 6eabf7e4b41105facf233b386647efc91339ea92 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 29 Dec 2023 11:44:31 +0000 Subject: rust: Upgrade 1.71.1 -> 1.72.0 Drop getrandom-open64.patch (merged upstream). Revert https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec ("Map source absolute paths to OUT_DIR as relative. (#684)") which causes hashed versions of the build path to be used as part of the filename of generated objects and hence reproducibility issues. https://blog.rust-lang.org/2023/08/24/Rust-1.72.0.html (From OE-Core rev: 30637cdeb31fae02544fdc643a455d0ebb126ee6) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- .../0001-Do-not-use-LFS64-on-linux-with-musl.patch | 51 ++++++++++++---------- 1 file changed, 28 insertions(+), 23 deletions(-) (limited to 'meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch') diff --git a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch index 37cfe42df6..dd23d09101 100644 --- a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch +++ b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++------- 3 files changed, 38 insertions(+), 12 deletions(-) -Index: rustc-1.71.0-src/library/std/src/os/linux/fs.rs +Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs =================================================================== ---- rustc-1.71.0-src.orig/library/std/src/os/linux/fs.rs -+++ rustc-1.71.0-src/library/std/src/os/linux/fs.rs +--- rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs ++++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs @@ -329,7 +329,14 @@ pub trait MetadataExt { impl MetadataExt for Metadata { #[allow(deprecated)] @@ -39,11 +39,11 @@ Index: rustc-1.71.0-src/library/std/src/os/linux/fs.rs } fn st_dev(&self) -> u64 { self.as_inner().as_inner().st_dev as u64 -Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs +Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs =================================================================== ---- rustc-1.71.0-src.orig/library/std/src/sys/unix/fd.rs -+++ rustc-1.71.0-src/library/std/src/sys/unix/fd.rs -@@ -122,9 +122,12 @@ impl FileDesc { +--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs ++++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs +@@ -124,9 +124,12 @@ impl FileDesc { } pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result { @@ -58,7 +58,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs use libc::pread64; unsafe { -@@ -277,9 +280,12 @@ impl FileDesc { +@@ -281,9 +284,12 @@ impl FileDesc { } pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result { @@ -73,11 +73,11 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs use libc::pwrite64; unsafe { -Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs +Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs =================================================================== ---- rustc-1.71.0-src.orig/library/std/src/sys/unix/fs.rs -+++ rustc-1.71.0-src/library/std/src/sys/unix/fs.rs -@@ -47,9 +47,13 @@ use libc::{c_int, mode_t}; +--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs ++++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs +@@ -50,9 +50,13 @@ use libc::{c_int, mode_t}; all(target_os = "linux", target_env = "gnu") ))] use libc::c_char; @@ -93,11 +93,8 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs use libc::fstatat64; #[cfg(any( target_os = "android", -@@ -58,9 +62,10 @@ use libc::fstatat64; - target_os = "redox", - target_os = "illumos", - target_os = "nto", -+ target_env = "musl", +@@ -64,7 +68,7 @@ use libc::fstatat64; + target_os = "vita", ))] use libc::readdir as readdir64; -#[cfg(target_os = "linux")] @@ -105,7 +102,15 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs use libc::readdir64; #[cfg(any(target_os = "emscripten", target_os = "l4re"))] use libc::readdir64_r; -@@ -81,7 +86,13 @@ use libc::{ +@@ -79,6 +83,7 @@ use libc::readdir64_r; + target_os = "redox", + target_os = "nto", + target_os = "vita", ++ target_env = "musl", + )))] + use libc::readdir_r as readdir64_r; + #[cfg(target_os = "android")] +@@ -86,7 +91,13 @@ use libc::{ dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64, lstat as lstat64, off64_t, open as open64, stat as stat64, }; @@ -119,7 +124,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs target_os = "linux", target_os = "emscripten", target_os = "l4re", -@@ -91,7 +102,7 @@ use libc::{ +@@ -96,7 +107,7 @@ use libc::{ dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64, lstat as lstat64, off_t as off64_t, open as open64, stat as stat64, }; @@ -128,7 +133,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64}; pub use crate::sys_common::fs::try_exists; -@@ -278,6 +289,7 @@ unsafe impl Sync for Dir {} +@@ -283,6 +294,7 @@ unsafe impl Sync for Dir {} #[cfg(any( target_os = "android", target_os = "linux", @@ -136,7 +141,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs target_os = "solaris", target_os = "illumos", target_os = "fuchsia", -@@ -312,6 +324,7 @@ struct dirent64_min { +@@ -324,6 +336,7 @@ struct dirent64_min { } #[cfg(not(any( @@ -144,7 +149,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs target_os = "android", target_os = "linux", target_os = "solaris", -@@ -805,7 +818,7 @@ impl DirEntry { +@@ -832,7 +845,7 @@ impl DirEntry { } #[cfg(all( @@ -153,7 +158,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs not(miri) ))] pub fn metadata(&self) -> io::Result { -@@ -829,7 +842,7 @@ impl DirEntry { +@@ -856,7 +869,7 @@ impl DirEntry { } #[cfg(any( -- cgit v1.2.3-54-g00ecf