Skip to contentSkip to conversation

rust: Upgrade 1.68.2 -> 1.69.0

PATCH New Alex Kiernan 1 participant 1 message Apr 26, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rust: Upgrade 1.68.2 -> 1.69.0

Rebase patches, drop crossbeam_atomic is this fully merged upstream.

https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html

---

Changes in v2:
- Rebase 0001-Do-not-use-LFS64-on-linux-with-musl correctly

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.68.2.bb => cargo_1.69.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 54 +++++++--------
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 52 ++++++++++-----
 .../rust/files/crossbeam_atomic.patch         | 50 --------------
 .../rust/files/hardcodepaths.patch            | 11 ++--
 ...ibstd-rs_1.68.2.bb => libstd-rs_1.69.0.bb} |  0
 ....68.2.bb => rust-cross-canadian_1.69.0.bb} |  0
 ...ust-llvm_1.68.2.bb => rust-llvm_1.69.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 66 +++++++++----------
 meta/recipes-devtools/rust/rust-source.inc    |  3 +-
 .../rust/{rust_1.68.2.bb => rust_1.69.0.bb}   |  0
 12 files changed, 99 insertions(+), 139 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.68.2.bb => cargo_1.69.0.bb} (100%)
 delete mode 100644 meta/recipes-devtools/rust/files/crossbeam_atomic.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.68.2.bb => libstd-rs_1.69.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.68.2.bb => rust-cross-canadian_1.69.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.68.2.bb => rust-llvm_1.69.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.68.2.bb => rust_1.69.0.bb} (100%)
meta/conf/distro/include/tcmode-default.inc +1 -1
index f9e88ca42699..dc4cd470e7b5 100644
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.1%"
 QEMUVERSION ?= "7.2%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "15.%"
-RUSTVERSION ?= "1.68%"
+RUSTVERSION ?= "1.69%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.69.0.bb renamed from meta/recipes-devtools/rust/cargo_1.68.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.68.2.bb
rename to meta/recipes-devtools/rust/cargo_1.69.0.bb
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch +25 -29

124 lines not on this page · raw message

meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch +34 -18

99 lines not on this page · raw message

meta/recipes-devtools/rust/files/crossbeam_atomic.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-devtools/rust/files/hardcodepaths.patch +5 -6
index cb99e8b01136..19c494ad9a4f 100644
@@ -4,12 +4,11 @@ to resolve these issues properly upstream.
 
 Upstream-Status: Inappropriate [patches need rework]
 Signed-off-by: Richard Purdie <[email protected]>
+Signed-off-by: Alex Kiernan <[email protected]>
 
-Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
-===================================================================
---- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
-+++ rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
-@@ -160,46 +160,6 @@ pub unsafe fn create_module<'ll>(
+--- rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs.orig	2023-04-21 08:38:23.092458478 +0100
++++ rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs	2023-04-21 08:39:00.266819755 +0100
+@@ -156,46 +156,6 @@
          }
      }
  
@@ -39,7 +38,7 @@ Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
 -        //
 -        // FIXME(#34960)
 -        let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or("");
--        let custom_llvm_used = cfg_llvm_root.trim() != "";
+-        let custom_llvm_used = !cfg_llvm_root.trim().is_empty();
 -
 -        if !custom_llvm_used && target_data_layout != llvm_data_layout {
 -            bug!(
meta/recipes-devtools/rust/libstd-rs_1.69.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.68.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.68.2.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.69.0.bb
meta/recipes-devtools/rust/rust-cross-canadian_1.69.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.68.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.68.2.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.69.0.bb
meta/recipes-devtools/rust/rust-llvm_1.69.0.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.68.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.68.2.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.69.0.bb
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 -2
index b25b5c17e880..9dceb904b66a 100644
@@ -1,14 +1,13 @@
 RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}"
 
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
-            file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \
             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} \
 "
-SRC_URI[rust.sha256sum] = "ce1a115f6aafa912b4622906a92b626354973afa9288e2c7750df4dcf3390fc0"
+SRC_URI[rust.sha256sum] = "e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
meta/recipes-devtools/rust/rust_1.69.0.bb renamed from meta/recipes-devtools/rust/rust_1.68.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.68.2.bb
rename to meta/recipes-devtools/rust/rust_1.69.0.bb
Signature · 1 line
2.39.0