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.patch40
1 files changed, 20 insertions, 20 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 7f8d62a2565..b4af70c36c6 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>
library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++-------
3 files changed, 38 insertions(+), 12 deletions(-)
-Index: rustc-1.70.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
===================================================================
---- rustc-1.70.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.70.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.70.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.70.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
===================================================================
---- rustc-1.70.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.70.0-src/library/std/src/sys/unix/fd.rs
-@@ -121,9 +121,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<usize> {
@@ -58,7 +58,7 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fd.rs
use libc::pread64;
unsafe {
-@@ -276,9 +279,12 @@ impl FileDesc {
+@@ -281,9 +284,12 @@ impl FileDesc {
}
pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result<usize> {
@@ -73,11 +73,11 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fd.rs
use libc::pwrite64;
unsafe {
-Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
===================================================================
---- rustc-1.70.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.70.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,10 +93,10 @@ Index: rustc-1.70.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",
+@@ -62,9 +66,10 @@ use libc::fstatat64;
target_os = "illumos",
target_os = "nto",
+ target_os = "vita",
+ target_env = "musl",
))]
use libc::readdir as readdir64;
@@ -105,7 +105,7 @@ Index: rustc-1.70.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::{
+@@ -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 +119,7 @@ Index: rustc-1.70.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 +128,7 @@ Index: rustc-1.70.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 +136,7 @@ Index: rustc-1.70.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 +144,7 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
target_os = "android",
target_os = "linux",
target_os = "solaris",
-@@ -787,7 +800,7 @@ impl DirEntry {
+@@ -832,7 +845,7 @@ impl DirEntry {
}
#[cfg(all(
@@ -153,7 +153,7 @@ Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
not(miri)
))]
pub fn metadata(&self) -> io::Result<FileAttr> {
-@@ -811,7 +824,7 @@ impl DirEntry {
+@@ -856,7 +869,7 @@ impl DirEntry {
}
#[cfg(any(