mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
rust: Upgrade 1.71.1 -> 1.72.0
Drop getrandom-open64.patch (merged upstream).
Revert c4f414f449
("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>
This commit is contained in:
committed by
Richard Purdie
parent
b40a8e0208
commit
6eabf7e4b4
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
|
||||
QEMUVERSION ?= "8.1%"
|
||||
GOVERSION ?= "1.20%"
|
||||
LLVMVERSION ?= "17.%"
|
||||
RUSTVERSION ?= "1.71%"
|
||||
RUSTVERSION ?= "1.72%"
|
||||
|
||||
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
|
||||
@@ -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.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<usize> {
|
||||
@@ -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<usize> {
|
||||
@@ -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<FileAttr> {
|
||||
@@ -829,7 +842,7 @@ impl DirEntry {
|
||||
@@ -856,7 +869,7 @@ impl DirEntry {
|
||||
}
|
||||
|
||||
#[cfg(any(
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 8bf0c566387e6a48d854d5f69c43c8bfa45092f9 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Kiernan <alexk@zuma.ai>
|
||||
Date: Sun, 24 Dec 2023 09:40:01 +0000
|
||||
Subject: [PATCH] Revert "Map source absolute paths to OUT_DIR as relative.
|
||||
(#684)"
|
||||
|
||||
This reverts commit c4f414f449bb7cffba3bc923f277704d1d08a8ec.
|
||||
|
||||
Upstream-Status: Inappropriate [patches need rework]
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
---
|
||||
src/lib.rs | 22 ++--------------------
|
||||
1 file changed, 2 insertions(+), 20 deletions(-)
|
||||
|
||||
Index: rustc-1.72.0-src/vendor/cc/src/lib.rs
|
||||
===================================================================
|
||||
--- rustc-1.72.0-src.orig/vendor/cc/src/lib.rs
|
||||
+++ rustc-1.72.0-src/vendor/cc/src/lib.rs
|
||||
@@ -56,12 +56,11 @@
|
||||
#![allow(deprecated)]
|
||||
#![deny(missing_docs)]
|
||||
|
||||
-use std::collections::{hash_map, HashMap};
|
||||
+use std::collections::HashMap;
|
||||
use std::env;
|
||||
use std::ffi::{OsStr, OsString};
|
||||
use std::fmt::{self, Display, Formatter};
|
||||
use std::fs;
|
||||
-use std::hash::Hasher;
|
||||
use std::io::{self, BufRead, BufReader, Read, Write};
|
||||
use std::path::{Component, Path, PathBuf};
|
||||
use std::process::{Child, Command, Stdio};
|
||||
@@ -1037,24 +1036,7 @@ impl Build {
|
||||
|
||||
let mut objects = Vec::new();
|
||||
for file in self.files.iter() {
|
||||
- let obj = if file.has_root() {
|
||||
- // If `file` is an absolute path, prefix the `basename`
|
||||
- // with the `dirname`'s hash to ensure name uniqueness.
|
||||
- let basename = file
|
||||
- .file_name()
|
||||
- .ok_or_else(|| Error::new(ErrorKind::InvalidArgument, "file_name() failure"))?
|
||||
- .to_string_lossy();
|
||||
- let dirname = file
|
||||
- .parent()
|
||||
- .ok_or_else(|| Error::new(ErrorKind::InvalidArgument, "parent() failure"))?
|
||||
- .to_string_lossy();
|
||||
- let mut hasher = hash_map::DefaultHasher::new();
|
||||
- hasher.write(dirname.to_string().as_bytes());
|
||||
- dst.join(format!("{:016x}-{}", hasher.finish(), basename))
|
||||
- .with_extension("o")
|
||||
- } else {
|
||||
- dst.join(file).with_extension("o")
|
||||
- };
|
||||
+ let obj = dst.join(file).with_extension("o");
|
||||
let obj = if !obj.starts_with(&dst) {
|
||||
dst.join(obj.file_name().ok_or_else(|| {
|
||||
Error::new(ErrorKind::IOError, "Getting object file details failed.")
|
||||
Index: rustc-1.72.0-src/vendor/cc/.cargo-checksum.json
|
||||
===================================================================
|
||||
--- rustc-1.72.0-src.orig/vendor/cc/.cargo-checksum.json
|
||||
+++ rustc-1.72.0-src/vendor/cc/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"Cargo.lock":"dddb9c49058d411a098e98dc1c06e3bc89f859a2080d96c11b11aec67394bb8c","Cargo.toml":"1953a8bc4b98e351fe75917c151b1e08a46531d562aebba25a90add4aadecac2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"58af5106352aafa62175a90f8a5f25fa114028bf909220dc0735d79745999ec1","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"29d0dee08a656ab1a4cc3e5fe24542e0fab5c1373cbc9b05059f7572cf9b8313","src/lib.rs":"17a4659710aa290c4ed9c23063c7b202c5bcf2a84de33aa1f01fc6fded69a1f8","src/registry.rs":"98ae2b71781acc49297e5544fa0cf059f735636f8f1338edef8dbf7232443945","src/setup_config.rs":"72deaf1927c0b713fd5c2b2d5b8f0ea3a303a00fda1579427895cac26a94122d","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"e128e95b2d39ae7a02f54a7e25d33c488c14759b9f1a50a449e10545856950c3","src/windows_registry.rs":"1f973f804b4b451e48ff6d98ce660355772f164dfdf79a6ae514645c7c764005","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"61fb35ae6dd5cf506ada000bdd82c92e9f8eac9cc053b63e83d3f897436fbf8f"},"package":"50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"}
|
||||
\ No newline at end of file
|
||||
+{"files":{"Cargo.lock":"dddb9c49058d411a098e98dc1c06e3bc89f859a2080d96c11b11aec67394bb8c","Cargo.toml":"1953a8bc4b98e351fe75917c151b1e08a46531d562aebba25a90add4aadecac2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"58af5106352aafa62175a90f8a5f25fa114028bf909220dc0735d79745999ec1","src/bin/gcc-shim.rs":"36dc4e447428e73c548cc7106ca1e8f282c098463b014e13a729a44445de4880","src/com.rs":"29d0dee08a656ab1a4cc3e5fe24542e0fab5c1373cbc9b05059f7572cf9b8313","src/lib.rs":"dfb36b17362e9a5b266cb19a229d982e8c0bba784b1e99769f690692b0cd5c4e","src/registry.rs":"98ae2b71781acc49297e5544fa0cf059f735636f8f1338edef8dbf7232443945","src/setup_config.rs":"72deaf1927c0b713fd5c2b2d5b8f0ea3a303a00fda1579427895cac26a94122d","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"e128e95b2d39ae7a02f54a7e25d33c488c14759b9f1a50a449e10545856950c3","src/windows_registry.rs":"1f973f804b4b451e48ff6d98ce660355772f164dfdf79a6ae514645c7c764005","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"a3c8d116973bb16066bf6ec4de5143183f97de7aad085d85f8118a2eaac3e1e0","tests/test.rs":"61fb35ae6dd5cf506ada000bdd82c92e9f8eac9cc053b63e83d3f897436fbf8f"},"package":"50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"}
|
||||
\ No newline at end of file
|
||||
File diff suppressed because one or more lines are too long
@@ -1,50 +0,0 @@
|
||||
Do not use open64 on linux with musl
|
||||
|
||||
glibc is providing open64 and other lfs64 functions but musl aliases
|
||||
them to normal equivalents since off_t is always 64-bit on musl,
|
||||
therefore check for target env along when target OS is linux before
|
||||
using open64, this is more available. Latest Musl has made these
|
||||
namespace changes [1]
|
||||
|
||||
There is no need for using LFS64 open explicitly as we are only using it
|
||||
for opening device files and not real files
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
|
||||
|
||||
Upstream-Status: Backport [https://github.com/rust-random/getrandom/commit/7f73e3ccc1f53bfc419e4ddcfd343766aa5837b6]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
Index: rustc-1.71.0-src/vendor/getrandom-0.2.8/.cargo-checksum.json
|
||||
===================================================================
|
||||
--- rustc-1.71.0-src.orig/vendor/getrandom-0.2.8/.cargo-checksum.json
|
||||
+++ rustc-1.71.0-src/vendor/getrandom-0.2.8/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"CHANGELOG.md":"cb054908f44d0e7f229dcc4580bcc4f2c3e2da198c84292710f730b33cc3d5f6","Cargo.toml":"708a5d9c89443b937aa50260e26a01f9ebfdd50a7ae312956795834e3187baf3","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"7ae74633326a22fd6298d7f209fb14884277bd98049795f444945acbb2b0dfbd","benches/mod.rs":"c01b05c6d690a4b8937d25252f1385a6bff378517318ce832ea520036aabd571","src/3ds.rs":"0f48fc15f89b518fb92e06aaa4838b62dc073598e8f288df56ad1e5a9251af1e","src/bsd_arandom.rs":"d90c419d4def20f83e7535cd3f5ec07035045011a50c3652951d196a120c5d3e","src/custom.rs":"ce4640776d36872dbbd5e194bf29f6bcda3ef4549ca04fe59f5aeab1dea1d821","src/dragonfly.rs":"47f933eac189f6ea48ecf021efd0747ebce1b43d1bece6bbf72a951bab705987","src/error.rs":"ff09a7e02d7aff3e45eca6bbef6c686cc46f3c2371a0897a856e4dec4b942e46","src/error_impls.rs":"9c34832ebb99cd5e31bc5c8ffc5beb5b3fa6f7ff0226aaa1cdf8e10e6d64b324","src/espidf.rs":"19f101486584fde6dad962f4d9792de168658047312106641a5caf6866a5bbcf","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"4bad4f5c096a50338b86aeac91a937c18bc55b9555e6f34806ad13732e64523d","src/js.rs":"370610a19045012c87c986279aad6b150cd728a44015dcc5779256e4a2e6629b","src/lib.rs":"8e5c2c8edcbdbf2cee46b86d96d951cc6d5c00f7c11cfc9c27de27e756b5c4cc","src/linux_android.rs":"ec24575aa4ae71b6991290dadfdea931b05397c3faababf24bd794f1a9624835","src/macos.rs":"6c09827ad5292cd022e063efa79523bfdb50ed08b9867ebaa007cd321b8d218e","src/openbsd.rs":"450a23ead462d4a840fee4aa0bfdab1e3d88c8f48e4bb608d457429ddeca69c0","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"d52fee9dd7d661f960c01894edd563c1ff8a512c111f7803092d9aa2ff98718e","src/solid.rs":"997035d54c9762d22a5a14f54e7fbed4dd266cdeacbdf6aab7d8aee05537e8ba","src/use_file.rs":"16e42eb0a56e375c330c1ca8eb58c444e82ef3ad35230b961fdba96a02a68804","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"2a63ac0e6dab16b85c4728b79a16e0640301e8b876f151b0a1db0b4394fa219f","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"dfdd0a870581948bd03abe64d49ca4295d9cfa26e09b97a526fd5e17148ad9ca","src/windows.rs":"d0b4f2afd1959660aa9abcd9477764bd7dc0b7d7048aee748804b37963c77c6f","tests/common/mod.rs":"b6beee8f535d2d094a65711fe0af91a6fc220aa09729ed7269fe33cafdc9177f","tests/custom.rs":"9f2c0193193f6bcf641116ca0b3653b33d2015e0e98ce107ee1d1f60c5eeae3a","tests/normal.rs":"9e1c4b1e468a09ed0225370dfb6608f8b8135e0fabb09bbc1a718105164aade6","tests/rdrand.rs":"4474ccebf9d33c89288862a7e367018405968dddc55c7c6f97e21b5fe2264601"},"package":"c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"}
|
||||
\ No newline at end of file
|
||||
+{"files":{"CHANGELOG.md":"cb054908f44d0e7f229dcc4580bcc4f2c3e2da198c84292710f730b33cc3d5f6","Cargo.toml":"708a5d9c89443b937aa50260e26a01f9ebfdd50a7ae312956795834e3187baf3","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"7ae74633326a22fd6298d7f209fb14884277bd98049795f444945acbb2b0dfbd","benches/mod.rs":"c01b05c6d690a4b8937d25252f1385a6bff378517318ce832ea520036aabd571","src/3ds.rs":"0f48fc15f89b518fb92e06aaa4838b62dc073598e8f288df56ad1e5a9251af1e","src/bsd_arandom.rs":"d90c419d4def20f83e7535cd3f5ec07035045011a50c3652951d196a120c5d3e","src/custom.rs":"ce4640776d36872dbbd5e194bf29f6bcda3ef4549ca04fe59f5aeab1dea1d821","src/dragonfly.rs":"47f933eac189f6ea48ecf021efd0747ebce1b43d1bece6bbf72a951bab705987","src/error.rs":"ff09a7e02d7aff3e45eca6bbef6c686cc46f3c2371a0897a856e4dec4b942e46","src/error_impls.rs":"9c34832ebb99cd5e31bc5c8ffc5beb5b3fa6f7ff0226aaa1cdf8e10e6d64b324","src/espidf.rs":"19f101486584fde6dad962f4d9792de168658047312106641a5caf6866a5bbcf","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"4bad4f5c096a50338b86aeac91a937c18bc55b9555e6f34806ad13732e64523d","src/js.rs":"370610a19045012c87c986279aad6b150cd728a44015dcc5779256e4a2e6629b","src/lib.rs":"8e5c2c8edcbdbf2cee46b86d96d951cc6d5c00f7c11cfc9c27de27e756b5c4cc","src/linux_android.rs":"ec24575aa4ae71b6991290dadfdea931b05397c3faababf24bd794f1a9624835","src/macos.rs":"6c09827ad5292cd022e063efa79523bfdb50ed08b9867ebaa007cd321b8d218e","src/openbsd.rs":"450a23ead462d4a840fee4aa0bfdab1e3d88c8f48e4bb608d457429ddeca69c0","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"d52fee9dd7d661f960c01894edd563c1ff8a512c111f7803092d9aa2ff98718e","src/solid.rs":"997035d54c9762d22a5a14f54e7fbed4dd266cdeacbdf6aab7d8aee05537e8ba","src/use_file.rs":"16e42eb0a56e375c330c1ca8eb58c444e82ef3ad35230b961fdba96a02a68804","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"a47b20e73637fed248405650f56358f3339e511b217b7ba80e32011d8ee2ca22","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"dfdd0a870581948bd03abe64d49ca4295d9cfa26e09b97a526fd5e17148ad9ca","src/windows.rs":"d0b4f2afd1959660aa9abcd9477764bd7dc0b7d7048aee748804b37963c77c6f","tests/common/mod.rs":"b6beee8f535d2d094a65711fe0af91a6fc220aa09729ed7269fe33cafdc9177f","tests/custom.rs":"9f2c0193193f6bcf641116ca0b3653b33d2015e0e98ce107ee1d1f60c5eeae3a","tests/normal.rs":"9e1c4b1e468a09ed0225370dfb6608f8b8135e0fabb09bbc1a718105164aade6","tests/rdrand.rs":"4474ccebf9d33c89288862a7e367018405968dddc55c7c6f97e21b5fe2264601"},"package":"c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"}
|
||||
\ No newline at end of file
|
||||
Index: rustc-1.71.0-src/vendor/getrandom-0.2.8/src/util_libc.rs
|
||||
===================================================================
|
||||
--- rustc-1.71.0-src.orig/vendor/getrandom-0.2.8/src/util_libc.rs
|
||||
+++ rustc-1.71.0-src/vendor/getrandom-0.2.8/src/util_libc.rs
|
||||
@@ -135,19 +135,11 @@ impl Weak {
|
||||
}
|
||||
}
|
||||
|
||||
-cfg_if! {
|
||||
- if #[cfg(any(target_os = "linux", target_os = "emscripten"))] {
|
||||
- use libc::open64 as open;
|
||||
- } else {
|
||||
- use libc::open;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
// SAFETY: path must be null terminated, FD must be manually closed.
|
||||
pub unsafe fn open_readonly(path: &str) -> Result<libc::c_int, Error> {
|
||||
debug_assert_eq!(path.as_bytes().last(), Some(&0));
|
||||
loop {
|
||||
- let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
|
||||
+ let fd = libc::open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
|
||||
if fd >= 0 {
|
||||
return Ok(fd);
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -4,51 +4,55 @@
|
||||
## The exact (previous) version that has been used is specified in the source tarball.
|
||||
## The version is replicated here.
|
||||
|
||||
SNAPSHOT_VERSION = "1.70.0"
|
||||
SNAPSHOT_VERSION = "1.71.0"
|
||||
|
||||
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "8fd2d9806f0601feab1485f79e46d1441af2158c68abf56788ff355d5c6b4ab5"
|
||||
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "966e85187b6b76dc520b23aadc886c5fe54b209a21c68f959ff00ef8542b7f9f"
|
||||
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "71698cf444eef74050db821dc4df996c0f268615230099cde836e685e5b5465d"
|
||||
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "13e8ff23d6af976a45f3ab451bf698e318a8d1823d588ff8a989555096f894a8"
|
||||
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "58542a0ab1162ce05a45eb751793782dc24c5bf8eb9a7467317f254260305ea6"
|
||||
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "e61b6e34df8c3a002798a9f627c4da701d66f9fc066a70264e354b03d06e6722"
|
||||
|
||||
SRC_URI[cargo-snapshot-i686.sha256sum] = "5d20e9b8e56f641c3ef4aef965563806aa220044397485ec56f784657451a329"
|
||||
SRC_URI[rust-std-snapshot-i686.sha256sum] = "0e5543c35196ca5b08f1b7e49fa3f3b671444d75648504cdbcfd854e2e7efd2d"
|
||||
SRC_URI[rustc-snapshot-i686.sha256sum] = "f89c90f80864f68e42b70d9c14984195629ed9894bb5cfe6c8a0f1140f7816ff"
|
||||
SRC_URI[cargo-snapshot-i686.sha256sum] = "ee836c079c53e8e2ed5b2cbad849f991f2142b0b47b593a29b5cb39a76ee910e"
|
||||
SRC_URI[rust-std-snapshot-i686.sha256sum] = "46976bf8297efc65556ccddfec395d5327fbe303f9dabffd104628a37cb1de6d"
|
||||
SRC_URI[rustc-snapshot-i686.sha256sum] = "e7c9c943b727de4f978cc9366e5c42536992d52ad418ffb9015e836723fd75ca"
|
||||
|
||||
SRC_URI[cargo-snapshot-mips.sha256sum] = "a272a2a34f03a89e1bc89d9bb11ec0dee08428f43b5103785a587091b3911c60"
|
||||
SRC_URI[rust-std-snapshot-mips.sha256sum] = "0cd85a53e328b1c445a8ec13af87f74280c1d344744076b102227f626456caec"
|
||||
SRC_URI[rustc-snapshot-mips.sha256sum] = "c1f51717bcec5a9c799d57d8c80eff7760c11fc5af383700fb22c3508dd9450e"
|
||||
SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "33dd282f63a2ccf0251baec5fa8d989276b1735528fe4b5153319038cedbe115"
|
||||
SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "1a7c473cb50248a505a0e08dc05df49291e48a302a7b138e3ce396b0d0df9dbb"
|
||||
SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "fbb21fefc8dee4c73f151b15f175caaabf10c3e122974d3fea3f3e2fbe916822"
|
||||
|
||||
SRC_URI[cargo-snapshot-mipsel.sha256sum] = "25d2aaad531403359c60ed3035005db782ba041549fdb60d3ef1a5b5a04b2970"
|
||||
SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "58bf8a6407d92cd4786991f1cbdec7380001e07c057c3a8946c2e54593bb7f8c"
|
||||
SRC_URI[rustc-snapshot-mipsel.sha256sum] = "0a6cf0eef9f1b67415ca5bbde1832cd3cd79560762251f3fb1b6f317ed5109bd"
|
||||
SRC_URI[cargo-snapshot-mips.sha256sum] = "ad068f683e44dbf539ab28d9a1ad1508d22b932aaa81ab0f77df2237817ef1e8"
|
||||
SRC_URI[rust-std-snapshot-mips.sha256sum] = "a259bddfc3ee36279b016ebd2682fc5b4d1b93c63bed6e4f57b5a2963d661dc9"
|
||||
SRC_URI[rustc-snapshot-mips.sha256sum] = "10d663c3b6cbf1d2166c2d544a2567c83bd8fb110c80064263393b89f025204c"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc.sha256sum] = "314ed27bbf7eed16f6ac0092b076a82782630c65927a241db921d1eff8b04759"
|
||||
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "101f358b08381b9c37c2f061bac1ff3e60c6036be20059c451f322a55f72376b"
|
||||
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "4e4fe3a8b2c0ea1f82e99a30c193b848464b7ac1ed802fddc100c11814a7b2ba"
|
||||
SRC_URI[cargo-snapshot-mipsel.sha256sum] = "c7973b800cadb67f6c5a4b938e03bb9e891ca5ab153da10a7913d9c3e18c9371"
|
||||
SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "ad91d662c93e5092367048c8e717f64a5096b876623e5fbc3c791b2d1f868dfb"
|
||||
SRC_URI[rustc-snapshot-mipsel.sha256sum] = "05d15f51fc33439582967dfc8f19364e67e8b5050abefbdd8913984e8a7be84e"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "ccb5b4c03f4d359cbeb1739ba27b725b0fc9d0d55b22837b0d3904e778a7fdc9"
|
||||
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "468672f84e5b140269e188b836ec82494d65c18bda8b7cf1f9bf6fce19f222ab"
|
||||
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "7891593a85ba231ca91505720a3535e9cff22700ee1f3e122bc33a5f10ddf705"
|
||||
SRC_URI[cargo-snapshot-powerpc.sha256sum] = "38d0a67429bbbe5e56ba30110c77d8dab3ebe96f8159de1d973da74e5bcbbc71"
|
||||
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "fac6cc57d8a922423db2f0239b8484df3b029d0b58a63676868de682680bbf87"
|
||||
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "1961433bbe12e84f2a01daa713779cb4a3fc53b856447047efee3ad02e596164"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "5f1751ab8d44a9c9e083d32a8039980d699a1224654e3f5aa0dfffbc4407f1c0"
|
||||
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "bbd882f9ec7f01a732ecc60cf50b7d8a10cd52c3de41c205f62938b6dc2b4dbc"
|
||||
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "7152b111cf91a2cfa1e7beb51d3c737561095ebdf75ec7e032ab1118639ea4ca"
|
||||
SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "a8f7d55c8e17db9737fad863b0b9327d79acf2baad2159d099b6d79e40ae79a5"
|
||||
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "628957fbe1f8665578167c6814486941f7b04417dce8a499cababa3284a2260a"
|
||||
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "0b14c621f0144d454fbe6093a31171e91163ea2a566092f35364817f5c77a96b"
|
||||
|
||||
SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "55c3a5c06b14c954df5318073c38a5b4b0ace3f9a32a24f0ef5514941f7c9502"
|
||||
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "cdecf32e245898306a27a0b164451b2ee9a2122176ce3a65f2ec73c200986dc3"
|
||||
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "7fa4de4b7f8ab8b23a0f2ef3dc4886658d3bf90a97f6b215146b75b445a6131b"
|
||||
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "9e6e184ad1836f52e5863b6ed72619926bb2e8c7ccf2b3c96bf86d7783f19673"
|
||||
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "3ce73e032232522cd7c37e64b1e8895f16ddcef02b1646d078f67bb36b6c1494"
|
||||
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "9c4e3d5740e48265ab59888090013793777a526ecf5541c0fb055f9f0a13f409"
|
||||
|
||||
SRC_URI[cargo-snapshot-s390x.sha256sum] = "dc4104e9e4b82dff14ffb20233d412ff57cea27e7bb2064b6a7e660fee6d2c4d"
|
||||
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "7084afbe9fb1a0e8a0c3e760f45475ebba400b72030ae8359bdccef67cb48992"
|
||||
SRC_URI[rustc-snapshot-s390x.sha256sum] = "2c8421d95d575d33545b969ed5d200bbcbc69a2ae80d0ffeba4c516fc8a91356"
|
||||
SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "bb78d8d09c8bb34d47a11276bc5566565a1dd075e1a5f4388347c767ba2b06a2"
|
||||
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "bf692cee46d6c04c3993795633fdc5d4c1dffa7e4d4924227fa3e044872440a4"
|
||||
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "1941967619e0a3b6b8d6c3175bd5530c8b1bf30a7044c071f1b1808a56532ea7"
|
||||
|
||||
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "650e7a890a52869cd14e2305652bff775aec7fc2cf47fc62cf4a89ff07242333"
|
||||
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "0c0129717da1e27ccf2c56da950d2fe56973f71beec9e80ae6904b282d2f0ee9"
|
||||
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "7d891d3e9bc4f1151545c83cbe3bc6af9ed234388c45ca2e19641262f48615e2"
|
||||
SRC_URI[cargo-snapshot-s390x.sha256sum] = "6ab6597d7e42e7a94246ec6679b6a5479e95ca84e76cc952544514ff901da605"
|
||||
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "4ceab97a7c15e1235aa099306798e1eb8620aad5477b7123dc9e343bb9a6fcfe"
|
||||
SRC_URI[rustc-snapshot-s390x.sha256sum] = "b94e7db76f3a0b13b8bc6f51f65f3a66ac3694ab2cf63b03c3f56ba6e7cce841"
|
||||
|
||||
SRC_URI[rust-std-snapshot-i586.sha256sum] = "f52e3ac35157e90f86e5ca6c177a43774425c24a51b15655ed61f6209c7db6f0"
|
||||
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "fe6fb520f59966300ee661d18b37c36cb3e614877c4c01dfedf987b8a9c577e9"
|
||||
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "98ae6530c3a41167e9d93d11ea078be98a02f6d809a06d0d51af3ce0f73150d7"
|
||||
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "c293d906769671d1cd18e945671bbd14e0b8a41df5075c47f33e6086fc8a1558"
|
||||
|
||||
SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "b06933f6f94cd30e1c2415b37db97a94533a727aa5d32a34ee80c6742ee418d2"
|
||||
SRC_URI[rust-std-snapshot-i586.sha256sum] = "5878f641f4e5a12ced79d2f0d5d9a9d5b0b97b56967684cf09357162c3e6a7b7"
|
||||
|
||||
SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "679ef3ee4a3876f071e08539734de2fabfcc3410977e8c20ba685bc9f40a693b"
|
||||
|
||||
SRC_URI += " \
|
||||
${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
|
||||
|
||||
@@ -2,12 +2,12 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}"
|
||||
|
||||
SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
|
||||
file://hardcodepaths.patch;patchdir=${RUSTSRC} \
|
||||
file://getrandom-open64.patch;patchdir=${RUSTSRC} \
|
||||
file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \
|
||||
file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
|
||||
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \
|
||||
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \
|
||||
"
|
||||
SRC_URI[rust.sha256sum] = "371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
|
||||
SRC_URI[rust.sha256sum] = "d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
|
||||
|
||||
RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user