Skip to content

Commit 778a952

Browse files
committed
[rust] Update to version 1.64.0.
1 parent 27eecc6 commit 778a952

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

0002-Disable-statx-for-all-builds.-JB-50106.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,33 @@ diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
2323
index 7181451de575fcb8ff7df27ba5a66b18a08904be..141e1726db49f1ac483a5788bdbc31388a1c942e 100644
2424
--- a/library/std/src/sys/unix/fs.rs
2525
+++ b/library/std/src/sys/unix/fs.rs
26-
@@ -13,23 +13,11 @@
26+
@@ -13,25 +13,11 @@
2727
use crate::sys::{cvt, cvt_r};
2828
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
2929

3030
-#[cfg(any(
3131
- all(target_os = "linux", target_env = "gnu"),
3232
- target_os = "macos",
3333
- target_os = "ios",
34+
- target_os = "watchos",
3435
-))]
3536
-use crate::sys::weak::syscall;
36-
#[cfg(target_os = "macos")]
37+
#[cfg(any(target_os = "android", target_os = "macos"))]
3738
use crate::sys::weak::weak;
3839

3940
use libc::{c_int, mode_t};
4041

4142
-#[cfg(any(
4243
- target_os = "macos",
4344
- target_os = "ios",
45+
- target_os = "watchos",
4446
- all(target_os = "linux", target_env = "gnu")
4547
-))]
4648
-use libc::c_char;
4749
#[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "android"))]
4850
use libc::dirfd;
4951
#[cfg(any(target_os = "linux", target_os = "emscripten"))]
50-
@@ -85,20 +73,9 @@
52+
@@ -87,20 +73,9 @@
5153
// https://github.com/rust-lang/rust/pull/67774
5254
macro_rules! cfg_has_statx {
5355
({ $($then_tt:tt)* } else { $($else_tt:tt)* }) => {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:177b4f95c8cdaa34bb29e69950cbfe236e123757078af4792779c43ee3818199
3+
size 384878959

rust.changes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Fri Feb 05 2021 Martin Kampas <martin.kampas@jolla.com> - 1.44.0+git10
1717
- [rust] Fix host-gcc use under SDK. JB#52983
1818

19-
* Fri Jan 25 2021 Niels Breet <niels.breet@jolla.com> - 1.44.0+git9
19+
* Fri Jan 29 2021 Niels Breet <niels.breet@jolla.com> - 1.44.0+git9
2020
- [aarch64] Enable aarch64 build for rust cross. JB#50499
2121

2222
* Mon Jan 25 2021 Matti Kosola <matti.kosola@jolla.com> - 1.44.0+git8

rust.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
%define rust_use_bootstrap 1
1212
%define bootstrap_arches i486
1313

14-
%global bootstrap_rust 1.61.0
15-
%global bootstrap_cargo 1.61.0
14+
%global bootstrap_rust 1.64.0
15+
%global bootstrap_cargo 1.64.0
1616

1717
# Only x86_64 and i686 are Tier 1 platforms at this time.
1818
# https://forge.rust-lang.org/platform-support.html
1919

20-
%global rust_version 1.61.0
20+
%global rust_version 1.64.0
2121

2222
%ifarch %ix86
2323
%define xbuildjobs %{nil}

rustc-1.64.0-src.tar.gz

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:b3cd9f481e1a2901bf6f3808d30c69cc4ea80d93c4cc4e2ed52258b180381205
3+
size 205881934

0 commit comments

Comments
 (0)