[packages/rust] up to 1.48.0
atler
atler at pld-linux.org
Fri Dec 4 00:52:13 CET 2020
commit 9e7854c5851b74d63a8f9bdd87292248a5b64343
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Dec 4 00:50:16 2020 +0100
up to 1.48.0
- libunwind directory workaround borrowed from fedora (required by
analyzer but apparently not used)
rust-x32.patch | 58 +++++++++++++++++++++++++++++-----------------------------
rust.spec | 21 ++++++++++++---------
2 files changed, 41 insertions(+), 38 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index bc6c06a..b80fb14 100644
--- a/rust.spec
+++ b/rust.spec
@@ -21,9 +21,9 @@
# To bootstrap from scratch, set the channel and date from src/stage0.txt
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD
-%define bootstrap_rust 1.46.0
-%define bootstrap_cargo 1.46.0
-%define bootstrap_date 2020-08-27
+%define bootstrap_rust 1.47.0
+%define bootstrap_cargo 1.47.0
+%define bootstrap_date 2020-10-08
%ifarch x32
%define with_cross 1
@@ -31,19 +31,19 @@
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.47.0
+Version: 1.48.0
Release: 0.1
# Licenses: (rust itself) and (bundled libraries)
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: 6283a61cac54bb0a7d32bc447d07fadc
+# Source0-md5: 1d8996bba1abbd5b3b149ccc89589664
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 45eaf35327db0bac923c65048637a2f5
+# Source1-md5: 9365de1153dae7bf1f99224382f8d77c
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 6a2422d81e98df5b71a959c70aa4c81b
+# Source2-md5: 9c351771a541e38416dd99ca85309059
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 144376df8b0ddfef57900b867746a9ab
+# Source3-md5: 1bb96238b441204e2b47561857ca9916
Patch0: %{name}-x32.patch
URL: https://www.rust-lang.org/
# for src/compiler-rt
@@ -301,7 +301,10 @@ test -f %{local_rust_root}/bin/rustc
# unbundle
# We're disabling jemalloc, but rust-src still wants it.
#%{__rm} -r src/jemalloc
-%{?with_system_llvm:%{__rm} -r src/llvm-project}
+%if %{with system_llvm}
+%{__rm} -r src/llvm-project
+mkdir -p src/llvm-project/libunwind
+%endif
# extract bundled licenses for packaging
sed -e '/*\//q' library/backtrace/crates/backtrace-sys/src/libbacktrace/backtrace.h \
diff --git a/rust-x32.patch b/rust-x32.patch
index ef50d32..09e4f7c 100644
--- a/rust-x32.patch
+++ b/rust-x32.patch
@@ -1,5 +1,5 @@
---- rustc-1.47.0-src.orig/src/librustc_errors/lib.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_errors/lib.rs 2020-10-30 13:52:39.921952637 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_errors/src/lib.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_errors/src/lib.rs 2020-10-30 13:52:39.921952637 +0100
@@ -45,7 +45,7 @@
// `PResult` is used a lot. Make sure it doesn't unintentionally get bigger.
@@ -9,30 +9,30 @@
rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16);
/// Indicates the confidence in the correctness of a suggestion.
---- rustc-1.47.0-src.orig/src/librustc_ast/ast.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_ast/ast.rs 2020-10-30 13:53:59.025035237 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_ast/src/ast.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_ast/src/ast.rs 2020-10-30 13:53:59.025035237 +0100
@@ -1056,7 +1056,7 @@
}
// `Expr` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_pointer_size = "64"))]
- rustc_data_structures::static_assert_size!(Expr, 104);
+ rustc_data_structures::static_assert_size!(Expr, 112);
impl Expr {
---- rustc-1.47.0-src.orig/src/librustc_ast/token.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_ast/token.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_ast/src/token.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_ast/src/token.rs 2020-10-30 13:52:39.925285960 +0100
@@ -710,7 +710,7 @@
}
// `Nonterminal` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_pointer_size = "64"))]
- rustc_data_structures::static_assert_size!(Nonterminal, 40);
+ rustc_data_structures::static_assert_size!(Nonterminal, 48);
#[derive(Debug, Copy, Clone, PartialEq, Encodable, Decodable)]
---- rustc-1.47.0-src.orig/src/librustc_ast/tokenstream.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_ast/tokenstream.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_ast/src/tokenstream.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_ast/src/tokenstream.rs 2020-10-30 13:52:39.925285960 +0100
@@ -130,7 +130,7 @@
pub type TreeAndJoint = (TokenTree, IsJoint);
@@ -42,8 +42,8 @@
rustc_data_structures::static_assert_size!(TokenStream, 8);
#[derive(Clone, Copy, Debug, PartialEq, Encodable, Decodable)]
---- rustc-1.47.0-src.orig/src/librustc_middle/mir/mod.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_middle/mir/mod.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_middle/src/mir/mod.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_middle/src/mir/mod.rs 2020-10-30 13:52:39.925285960 +0100
@@ -1353,7 +1353,7 @@
}
@@ -59,11 +59,11 @@
// At least on 64 bit systems, `PlaceElem` should not be larger than two pointers.
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_pointer_size = "64"))]
- static_assert_size!(PlaceElem<'_>, 16);
+ static_assert_size!(PlaceElem<'_>, 24);
/// Alias for projections as they appear in `UserTypeProjection`, where we
---- rustc-1.47.0-src.orig/src/librustc_middle/mir/tcx.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_middle/mir/tcx.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_middle/src/mir/tcx.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_middle/src/mir/tcx.rs 2020-10-30 13:52:39.925285960 +0100
@@ -17,7 +17,7 @@
}
@@ -73,8 +73,8 @@
static_assert_size!(PlaceTy<'_>, 16);
impl<'tcx> PlaceTy<'tcx> {
---- rustc-1.47.0-src.orig/src/librustc_middle/traits/mod.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_middle/traits/mod.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_middle/src/traits/mod.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_middle/src/traits/mod.rs 2020-10-30 13:52:39.925285960 +0100
@@ -339,7 +339,7 @@
}
@@ -84,8 +84,8 @@
static_assert_size!(ObligationCauseCode<'_>, 32);
#[derive(Clone, Debug, PartialEq, Eq, Hash, Lift)]
---- rustc-1.47.0-src.orig/src/librustc_middle/ty/mod.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_middle/ty/mod.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_middle/src/ty/mod.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_middle/src/ty/mod.rs 2020-10-30 13:52:39.925285960 +0100
@@ -604,7 +604,7 @@
}
@@ -95,8 +95,8 @@
static_assert_size!(TyS<'_>, 32);
impl<'tcx> Ord for TyS<'tcx> {
---- rustc-1.47.0-src.orig/src/librustc_middle/ty/sty.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_middle/ty/sty.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_middle/src/ty/sty.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_middle/src/ty/sty.rs 2020-10-30 13:52:39.925285960 +0100
@@ -213,7 +213,7 @@
}
@@ -106,30 +106,30 @@
static_assert_size!(TyKind<'_>, 24);
/// A closure can be modeled as a struct that looks like:
---- rustc-1.47.0-src.orig/src/librustc_infer/traits/mod.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_infer/traits/mod.rs 2020-10-30 13:53:29.548462138 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_infer/src/traits/mod.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_infer/src/traits/mod.rs 2020-10-30 13:53:29.548462138 +0100
@@ -56,7 +56,7 @@
pub type TraitObligation<'tcx> = Obligation<'tcx, ty::PolyTraitPredicate<'tcx>>;
// `PredicateObligation` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_pointer_size = "64"))]
- static_assert_size!(PredicateObligation<'_>, 40);
+ static_assert_size!(PredicateObligation<'_>, 32);
pub type Obligations<'tcx, O> = Vec<Obligation<'tcx, O>>;
---- rustc-1.47.0-src.orig/src/librustc_trait_selection/traits/fulfill.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_trait_selection/traits/fulfill.rs 2020-10-30 13:53:12.381849892 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_trait_selection/src/traits/fulfill.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_trait_selection/src/traits/fulfill.rs 2020-10-30 13:53:12.381849892 +0100
@@ -85,7 +85,7 @@
}
// `PendingPredicateObligation` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_pointer_size = "64"))]
- static_assert_size!(PendingPredicateObligation<'_>, 64);
+ static_assert_size!(PendingPredicateObligation<'_>, 56);
impl<'a, 'tcx> FulfillmentContext<'tcx> {
---- rustc-1.47.0-src.orig/src/librustc_trait_selection/lib.rs 2020-10-07 09:53:22.000000000 +0200
-+++ rustc-1.47.0-src/src/librustc_trait_selection/lib.rs 2020-10-30 13:52:39.925285960 +0100
+--- rustc-1.47.0-src.orig/compiler/rustc_trait_selection/src/lib.rs 2020-10-07 09:53:22.000000000 +0200
++++ rustc-1.47.0-src/compiler/rustc_trait_selection/src/lib.rs 2020-10-30 13:52:39.925285960 +0100
@@ -20,7 +20,7 @@
#[macro_use]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/9e7854c5851b74d63a8f9bdd87292248a5b64343
More information about the pld-cvs-commit
mailing list