Skip to contentSkip to conversation

rust: Upgrade 1.69.0 -> 1.70.0

PATCH New Alex Kiernan 1 participant 1 message Jun 2, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rust: Upgrade 1.69.0 -> 1.70.0

Drop 0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch as this is merged upstream in rust-llvm.

https://blog.rust-lang.org/2023/06/01/Rust-1.70.0.html

---

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.69.0.bb => cargo_1.70.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 34 ++++----
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 56 ++++++-------
 ...ibstd-rs_1.69.0.bb => libstd-rs_1.70.0.bb} |  0
 ....69.0.bb => rust-cross-canadian_1.70.0.bb} |  0
 ...e-64bit-off_t-on-32bit-glibc-systems.patch | 79 -------------------
 ...ust-llvm_1.69.0.bb => rust-llvm_1.70.0.bb} |  5 +-
 meta/recipes-devtools/rust/rust-snapshot.inc  | 66 ++++++++--------
 meta/recipes-devtools/rust/rust-source.inc    |  2 +-
 .../rust/{rust_1.69.0.bb => rust_1.70.0.bb}   |  0
 11 files changed, 82 insertions(+), 162 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.69.0.bb => cargo_1.70.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.69.0.bb => libstd-rs_1.70.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.69.0.bb => rust-cross-canadian_1.70.0.bb} (100%)
 delete mode 100644 meta/recipes-devtools/rust/rust-llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch
 rename meta/recipes-devtools/rust/{rust-llvm_1.69.0.bb => rust-llvm_1.70.0.bb} (94%)
 rename meta/recipes-devtools/rust/{rust_1.69.0.bb => rust_1.70.0.bb} (100%)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 52b050ec4141..0b33e619249d 100644
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.1%"
 QEMUVERSION ?= "8.0%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "16.%"
-RUSTVERSION ?= "1.69%"
+RUSTVERSION ?= "1.70%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.70.0.bb renamed from meta/recipes-devtools/rust/cargo_1.69.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.69.0.bb
rename to meta/recipes-devtools/rust/cargo_1.70.0.bb
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch +17 -17
index 77f22f42b603..7f8d62a25651 100644
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <[email protected]>
  library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++-------
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.69.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.70.0-src/library/std/src/os/linux/fs.rs
 ===================================================================
---- rustc-1.69.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.69.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
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
      #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.69.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.69.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.70.0-src/library/std/src/sys/unix/fd.rs
 ===================================================================
---- rustc-1.69.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.69.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 {
      }
  
@@ -73,11 +73,11 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fd.rs
          use libc::pwrite64;
  
          unsafe {
-Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.70.0-src/library/std/src/sys/unix/fs.rs
 ===================================================================
---- rustc-1.69.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
-@@ -46,9 +46,13 @@ use libc::{c_int, mode_t};
+--- 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};
      all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
      target_os = "android",
-@@ -57,9 +61,10 @@ use libc::fstatat64;
+@@ -58,9 +62,10 @@ use libc::fstatat64;
      target_os = "redox",
      target_os = "illumos",
      target_os = "nto",
@@ -105,7 +105,7 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -80,7 +85,13 @@ use libc::{
+@@ -81,7 +86,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.69.0-src/library/std/src/sys/unix/fs.rs
      target_os = "linux",
      target_os = "emscripten",
      target_os = "l4re",
-@@ -90,7 +101,7 @@ use libc::{
+@@ -91,7 +102,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.69.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;
-@@ -277,6 +288,7 @@ unsafe impl Sync for Dir {}
+@@ -278,6 +289,7 @@ unsafe impl Sync for Dir {}
  #[cfg(any(
      target_os = "android",
      target_os = "linux",
@@ -136,7 +136,7 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
      target_os = "solaris",
      target_os = "illumos",
      target_os = "fuchsia",
-@@ -311,6 +323,7 @@ struct dirent64_min {
+@@ -312,6 +324,7 @@ struct dirent64_min {
  }
  
  #[cfg(not(any(
@@ -144,7 +144,7 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
      target_os = "android",
      target_os = "linux",
      target_os = "solaris",
-@@ -786,7 +799,7 @@ impl DirEntry {
+@@ -787,7 +800,7 @@ impl DirEntry {
      }
  
      #[cfg(all(
@@ -153,7 +153,7 @@ Index: rustc-1.69.0-src/library/std/src/sys/unix/fs.rs
          not(miri)
      ))]
      pub fn metadata(&self) -> io::Result<FileAttr> {
-@@ -810,7 +823,7 @@ impl DirEntry {
+@@ -811,7 +824,7 @@ impl DirEntry {
      }
  
      #[cfg(any(
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch +28 -28

111 lines not on this page · raw message

meta/recipes-devtools/rust/libstd-rs_1.70.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.69.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.69.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.70.0.bb
meta/recipes-devtools/rust/rust-cross-canadian_1.70.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.69.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.69.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.70.0.bb
meta/recipes-devtools/rust/rust-llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch deleted +0 -79

79 lines not on this page · raw message

meta/recipes-devtools/rust/rust-llvm_1.70.0.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.69.0.bb +2 -3
similarity index 94%
rename from meta/recipes-devtools/rust/rust-llvm_1.69.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.70.0.bb
index 6304070debf3..09e4c65be383 100644
@@ -4,14 +4,13 @@ HOMEPAGE = "http://www.rust-lang.org"
 
 # check src/llvm-project/llvm/CMakeLists.txt for llvm version in use
 #
-LLVM_RELEASE = "15.0.6"
+LLVM_RELEASE = "16.0.2"
 
 require rust-source.inc
 
 SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
             file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
-	    file://0003-llvm-fix-include-benchmarks.patch;striplevel=2 \
-	    file://0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch;striplevel=2"
+	    file://0003-llvm-fix-include-benchmarks.patch;striplevel=2"
 
 S = "${RUSTSRC}/src/llvm-project/llvm"
 
meta/recipes-devtools/rust/rust-snapshot.inc +33 -33

84 lines not on this page · raw message

meta/recipes-devtools/rust/rust-source.inc +1 -1
index 9dceb904b66a..fbe2492fb4f5 100644
@@ -7,7 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
             file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
             file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \
 "
-SRC_URI[rust.sha256sum] = "e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75"
+SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
meta/recipes-devtools/rust/rust_1.70.0.bb renamed from meta/recipes-devtools/rust/rust_1.69.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.69.0.bb
rename to meta/recipes-devtools/rust/rust_1.70.0.bb
Signature · 1 line
2.39.0