summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2023-12-29 11:44:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-30 11:03:08 +0000
commit6eabf7e4b41105facf233b386647efc91339ea92 (patch)
tree5d022a8afb8676b91a3477e861fcd6c0e8d8fb29 /meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
parentb40a8e02084b8c554cc15516223f9858c4636439 (diff)
downloadpoky-6eabf7e4b41105facf233b386647efc91339ea92.tar.gz
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 <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch')
-rw-r--r--meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch51
1 files changed, 28 insertions, 23 deletions
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 <raj.khem@gmail.com>
19 library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++------- 19 library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++-------
20 3 files changed, 38 insertions(+), 12 deletions(-) 20 3 files changed, 38 insertions(+), 12 deletions(-)
21 21
22Index: rustc-1.71.0-src/library/std/src/os/linux/fs.rs 22Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
23=================================================================== 23===================================================================
24--- rustc-1.71.0-src.orig/library/std/src/os/linux/fs.rs 24--- rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
25+++ rustc-1.71.0-src/library/std/src/os/linux/fs.rs 25+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
26@@ -329,7 +329,14 @@ pub trait MetadataExt { 26@@ -329,7 +329,14 @@ pub trait MetadataExt {
27 impl MetadataExt for Metadata { 27 impl MetadataExt for Metadata {
28 #[allow(deprecated)] 28 #[allow(deprecated)]
@@ -39,11 +39,11 @@ Index: rustc-1.71.0-src/library/std/src/os/linux/fs.rs
39 } 39 }
40 fn st_dev(&self) -> u64 { 40 fn st_dev(&self) -> u64 {
41 self.as_inner().as_inner().st_dev as u64 41 self.as_inner().as_inner().st_dev as u64
42Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs 42Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
43=================================================================== 43===================================================================
44--- rustc-1.71.0-src.orig/library/std/src/sys/unix/fd.rs 44--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
45+++ rustc-1.71.0-src/library/std/src/sys/unix/fd.rs 45+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
46@@ -122,9 +122,12 @@ impl FileDesc { 46@@ -124,9 +124,12 @@ impl FileDesc {
47 } 47 }
48 48
49 pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result<usize> { 49 pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result<usize> {
@@ -58,7 +58,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs
58 use libc::pread64; 58 use libc::pread64;
59 59
60 unsafe { 60 unsafe {
61@@ -277,9 +280,12 @@ impl FileDesc { 61@@ -281,9 +284,12 @@ impl FileDesc {
62 } 62 }
63 63
64 pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result<usize> { 64 pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result<usize> {
@@ -73,11 +73,11 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs
73 use libc::pwrite64; 73 use libc::pwrite64;
74 74
75 unsafe { 75 unsafe {
76Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs 76Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
77=================================================================== 77===================================================================
78--- rustc-1.71.0-src.orig/library/std/src/sys/unix/fs.rs 78--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
79+++ rustc-1.71.0-src/library/std/src/sys/unix/fs.rs 79+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
80@@ -47,9 +47,13 @@ use libc::{c_int, mode_t}; 80@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
81 all(target_os = "linux", target_env = "gnu") 81 all(target_os = "linux", target_env = "gnu")
82 ))] 82 ))]
83 use libc::c_char; 83 use libc::c_char;
@@ -93,11 +93,8 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
93 use libc::fstatat64; 93 use libc::fstatat64;
94 #[cfg(any( 94 #[cfg(any(
95 target_os = "android", 95 target_os = "android",
96@@ -58,9 +62,10 @@ use libc::fstatat64; 96@@ -64,7 +68,7 @@ use libc::fstatat64;
97 target_os = "redox", 97 target_os = "vita",
98 target_os = "illumos",
99 target_os = "nto",
100+ target_env = "musl",
101 ))] 98 ))]
102 use libc::readdir as readdir64; 99 use libc::readdir as readdir64;
103-#[cfg(target_os = "linux")] 100-#[cfg(target_os = "linux")]
@@ -105,7 +102,15 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
105 use libc::readdir64; 102 use libc::readdir64;
106 #[cfg(any(target_os = "emscripten", target_os = "l4re"))] 103 #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
107 use libc::readdir64_r; 104 use libc::readdir64_r;
108@@ -81,7 +86,13 @@ use libc::{ 105@@ -79,6 +83,7 @@ use libc::readdir64_r;
106 target_os = "redox",
107 target_os = "nto",
108 target_os = "vita",
109+ target_env = "musl",
110 )))]
111 use libc::readdir_r as readdir64_r;
112 #[cfg(target_os = "android")]
113@@ -86,7 +91,13 @@ use libc::{
109 dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64, 114 dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64,
110 lstat as lstat64, off64_t, open as open64, stat as stat64, 115 lstat as lstat64, off64_t, open as open64, stat as stat64,
111 }; 116 };
@@ -119,7 +124,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
119 target_os = "linux", 124 target_os = "linux",
120 target_os = "emscripten", 125 target_os = "emscripten",
121 target_os = "l4re", 126 target_os = "l4re",
122@@ -91,7 +102,7 @@ use libc::{ 127@@ -96,7 +107,7 @@ use libc::{
123 dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64, 128 dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64,
124 lstat as lstat64, off_t as off64_t, open as open64, stat as stat64, 129 lstat as lstat64, off_t as off64_t, open as open64, stat as stat64,
125 }; 130 };
@@ -128,7 +133,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
128 use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64}; 133 use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64};
129 134
130 pub use crate::sys_common::fs::try_exists; 135 pub use crate::sys_common::fs::try_exists;
131@@ -278,6 +289,7 @@ unsafe impl Sync for Dir {} 136@@ -283,6 +294,7 @@ unsafe impl Sync for Dir {}
132 #[cfg(any( 137 #[cfg(any(
133 target_os = "android", 138 target_os = "android",
134 target_os = "linux", 139 target_os = "linux",
@@ -136,7 +141,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
136 target_os = "solaris", 141 target_os = "solaris",
137 target_os = "illumos", 142 target_os = "illumos",
138 target_os = "fuchsia", 143 target_os = "fuchsia",
139@@ -312,6 +324,7 @@ struct dirent64_min { 144@@ -324,6 +336,7 @@ struct dirent64_min {
140 } 145 }
141 146
142 #[cfg(not(any( 147 #[cfg(not(any(
@@ -144,7 +149,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
144 target_os = "android", 149 target_os = "android",
145 target_os = "linux", 150 target_os = "linux",
146 target_os = "solaris", 151 target_os = "solaris",
147@@ -805,7 +818,7 @@ impl DirEntry { 152@@ -832,7 +845,7 @@ impl DirEntry {
148 } 153 }
149 154
150 #[cfg(all( 155 #[cfg(all(
@@ -153,7 +158,7 @@ Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
153 not(miri) 158 not(miri)
154 ))] 159 ))]
155 pub fn metadata(&self) -> io::Result<FileAttr> { 160 pub fn metadata(&self) -> io::Result<FileAttr> {
156@@ -829,7 +842,7 @@ impl DirEntry { 161@@ -856,7 +869,7 @@ impl DirEntry {
157 } 162 }
158 163
159 #[cfg(any( 164 #[cfg(any(