diff options
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.patch | 36 |
1 files changed, 18 insertions, 18 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 dd23d09101..794ad804f0 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 | ||
22 | Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs | 22 | Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs |
23 | =================================================================== | 23 | =================================================================== |
24 | --- rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs | 24 | --- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs |
25 | +++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs | 25 | +++ rustc-1.73.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,10 +39,10 @@ Index: rustc-1.72.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 |
42 | Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs | 42 | Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs |
43 | =================================================================== | 43 | =================================================================== |
44 | --- rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs | 44 | --- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs |
45 | +++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs | 45 | +++ rustc-1.73.0-src/library/std/src/sys/unix/fd.rs |
46 | @@ -124,9 +124,12 @@ impl FileDesc { | 46 | @@ -124,9 +124,12 @@ impl FileDesc { |
47 | } | 47 | } |
48 | 48 | ||
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs | |||
73 | use libc::pwrite64; | 73 | use libc::pwrite64; |
74 | 74 | ||
75 | unsafe { | 75 | unsafe { |
76 | Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | 76 | Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs |
77 | =================================================================== | 77 | =================================================================== |
78 | --- rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs | 78 | --- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs |
79 | +++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | 79 | +++ rustc-1.73.0-src/library/std/src/sys/unix/fs.rs |
80 | @@ -50,9 +50,13 @@ use libc::{c_int, mode_t}; | 80 | @@ -39,9 +39,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,7 +93,7 @@ Index: rustc-1.72.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 | @@ -64,7 +68,7 @@ use libc::fstatat64; | 96 | @@ -53,7 +57,7 @@ use libc::fstatat64; |
97 | target_os = "vita", | 97 | target_os = "vita", |
98 | ))] | 98 | ))] |
99 | use libc::readdir as readdir64; | 99 | use libc::readdir as readdir64; |
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
102 | use libc::readdir64; | 102 | use libc::readdir64; |
103 | #[cfg(any(target_os = "emscripten", target_os = "l4re"))] | 103 | #[cfg(any(target_os = "emscripten", target_os = "l4re"))] |
104 | use libc::readdir64_r; | 104 | use libc::readdir64_r; |
105 | @@ -79,6 +83,7 @@ use libc::readdir64_r; | 105 | @@ -68,6 +72,7 @@ use libc::readdir64_r; |
106 | target_os = "redox", | 106 | target_os = "redox", |
107 | target_os = "nto", | 107 | target_os = "nto", |
108 | target_os = "vita", | 108 | target_os = "vita", |
@@ -110,7 +110,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
110 | )))] | 110 | )))] |
111 | use libc::readdir_r as readdir64_r; | 111 | use libc::readdir_r as readdir64_r; |
112 | #[cfg(target_os = "android")] | 112 | #[cfg(target_os = "android")] |
113 | @@ -86,7 +91,13 @@ use libc::{ | 113 | @@ -75,7 +80,13 @@ use libc::{ |
114 | dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64, | 114 | dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64, |
115 | lstat as lstat64, off64_t, open as open64, stat as stat64, | 115 | lstat as lstat64, off64_t, open as open64, stat as stat64, |
116 | }; | 116 | }; |
@@ -124,7 +124,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
124 | target_os = "linux", | 124 | target_os = "linux", |
125 | target_os = "emscripten", | 125 | target_os = "emscripten", |
126 | target_os = "l4re", | 126 | target_os = "l4re", |
127 | @@ -96,7 +107,7 @@ use libc::{ | 127 | @@ -85,7 +96,7 @@ use libc::{ |
128 | 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, |
129 | 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, |
130 | }; | 130 | }; |
@@ -133,7 +133,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
133 | use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64}; | 133 | use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64}; |
134 | 134 | ||
135 | pub use crate::sys_common::fs::try_exists; | 135 | pub use crate::sys_common::fs::try_exists; |
136 | @@ -283,6 +294,7 @@ unsafe impl Sync for Dir {} | 136 | @@ -272,6 +283,7 @@ unsafe impl Sync for Dir {} |
137 | #[cfg(any( | 137 | #[cfg(any( |
138 | target_os = "android", | 138 | target_os = "android", |
139 | target_os = "linux", | 139 | target_os = "linux", |
@@ -141,7 +141,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
141 | target_os = "solaris", | 141 | target_os = "solaris", |
142 | target_os = "illumos", | 142 | target_os = "illumos", |
143 | target_os = "fuchsia", | 143 | target_os = "fuchsia", |
144 | @@ -324,6 +336,7 @@ struct dirent64_min { | 144 | @@ -313,6 +325,7 @@ struct dirent64_min { |
145 | } | 145 | } |
146 | 146 | ||
147 | #[cfg(not(any( | 147 | #[cfg(not(any( |
@@ -149,7 +149,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
149 | target_os = "android", | 149 | target_os = "android", |
150 | target_os = "linux", | 150 | target_os = "linux", |
151 | target_os = "solaris", | 151 | target_os = "solaris", |
152 | @@ -832,7 +845,7 @@ impl DirEntry { | 152 | @@ -809,7 +822,7 @@ impl DirEntry { |
153 | } | 153 | } |
154 | 154 | ||
155 | #[cfg(all( | 155 | #[cfg(all( |
@@ -158,7 +158,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs | |||
158 | not(miri) | 158 | not(miri) |
159 | ))] | 159 | ))] |
160 | pub fn metadata(&self) -> io::Result<FileAttr> { | 160 | pub fn metadata(&self) -> io::Result<FileAttr> { |
161 | @@ -856,7 +869,7 @@ impl DirEntry { | 161 | @@ -833,7 +846,7 @@ impl DirEntry { |
162 | } | 162 | } |
163 | 163 | ||
164 | #[cfg(any( | 164 | #[cfg(any( |