summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
diff options
context:
space:
mode:
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.patch26
1 files changed, 13 insertions, 13 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 7f8d62a256..37cfe42df6 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.70.0-src/library/std/src/os/linux/fs.rs 22Index: rustc-1.71.0-src/library/std/src/os/linux/fs.rs
23=================================================================== 23===================================================================
24--- rustc-1.70.0-src.orig/library/std/src/os/linux/fs.rs 24--- rustc-1.71.0-src.orig/library/std/src/os/linux/fs.rs
25+++ rustc-1.70.0-src/library/std/src/os/linux/fs.rs 25+++ rustc-1.71.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.70.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.70.0-src/library/std/src/sys/unix/fd.rs 42Index: rustc-1.71.0-src/library/std/src/sys/unix/fd.rs
43=================================================================== 43===================================================================
44--- rustc-1.70.0-src.orig/library/std/src/sys/unix/fd.rs 44--- rustc-1.71.0-src.orig/library/std/src/sys/unix/fd.rs
45+++ rustc-1.70.0-src/library/std/src/sys/unix/fd.rs 45+++ rustc-1.71.0-src/library/std/src/sys/unix/fd.rs
46@@ -121,9 +121,12 @@ impl FileDesc { 46@@ -122,9 +122,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.70.0-src/library/std/src/sys/unix/fd.rs
58 use libc::pread64; 58 use libc::pread64;
59 59
60 unsafe { 60 unsafe {
61@@ -276,9 +279,12 @@ impl FileDesc { 61@@ -277,9 +280,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,10 +73,10 @@ Index: rustc-1.70.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.70.0-src/library/std/src/sys/unix/fs.rs 76Index: rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
77=================================================================== 77===================================================================
78--- rustc-1.70.0-src.orig/library/std/src/sys/unix/fs.rs 78--- rustc-1.71.0-src.orig/library/std/src/sys/unix/fs.rs
79+++ rustc-1.70.0-src/library/std/src/sys/unix/fs.rs 79+++ rustc-1.71.0-src/library/std/src/sys/unix/fs.rs
80@@ -47,9 +47,13 @@ use libc::{c_int, mode_t}; 80@@ -47,9 +47,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 ))]
@@ -144,7 +144,7 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
144 target_os = "android", 144 target_os = "android",
145 target_os = "linux", 145 target_os = "linux",
146 target_os = "solaris", 146 target_os = "solaris",
147@@ -787,7 +800,7 @@ impl DirEntry { 147@@ -805,7 +818,7 @@ impl DirEntry {
148 } 148 }
149 149
150 #[cfg(all( 150 #[cfg(all(
@@ -153,7 +153,7 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
153 not(miri) 153 not(miri)
154 ))] 154 ))]
155 pub fn metadata(&self) -> io::Result<FileAttr> { 155 pub fn metadata(&self) -> io::Result<FileAttr> {
156@@ -811,7 +824,7 @@ impl DirEntry { 156@@ -829,7 +842,7 @@ impl DirEntry {
157 } 157 }
158 158
159 #[cfg(any( 159 #[cfg(any(