import rust-1.54.0-2.module+el8.5.0+12254+dc27bae9
This commit is contained in:
CentOS Sources
parent
66ef506bc5
commit
d467165303
|
|
@ -1 +1 @@
|
|||
SOURCES/rustc-1.53.0-src.tar.xz
|
||||
SOURCES/rustc-1.54.0-src.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ae467484f1e961f15bb521a6b5305377ec61f039 SOURCES/rustc-1.53.0-src.tar.xz
|
||||
1577242bee41fe6c1aee17d47ae791f4bfc1f8c3 SOURCES/rustc-1.54.0-src.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3582a262d27fd5a2f8705bad6018241eaca8aadd Mon Sep 17 00:00:00 2001
|
||||
From 9ac837c237568a6c1c5f0e979fcce208cd9c926a Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Mironov <mironov.ivan@gmail.com>
|
||||
Date: Sun, 8 Dec 2019 17:23:08 +0500
|
||||
Subject: [PATCH] Use lld provided by system for wasm
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Use lld provided by system for wasm
|
|||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
index b208eb92f8ff..94a701a11c8b 100644
|
||||
index 4c954a1e567c..15c4f1bda5eb 100644
|
||||
--- a/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
@@ -98,8 +98,7 @@ pub fn options() -> TargetOptions {
|
||||
@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
|
||||
// arguments just yet
|
||||
limit_rdylib_exports: false,
|
||||
|
||||
|
|
@ -19,8 +19,8 @@ index b208eb92f8ff..94a701a11c8b 100644
|
|||
- linker: Some("rust-lld".to_owned()),
|
||||
+ linker: Some("lld".to_owned()),
|
||||
lld_flavor: LldFlavor::Wasm,
|
||||
linker_is_gnu: false,
|
||||
|
||||
// No need for indirection here, simd types can always be passed by
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
||||
# or nightly wants some beta-YYYY-MM-DD
|
||||
# Note that cargo matches the program version here, not its crate version.
|
||||
%global bootstrap_rust 1.52.0
|
||||
%global bootstrap_cargo 1.52.0
|
||||
%global bootstrap_channel 1.52.0
|
||||
%global bootstrap_date 2021-05-06
|
||||
%global bootstrap_rust 1.53.0
|
||||
%global bootstrap_cargo 1.53.0
|
||||
%global bootstrap_channel 1.53.0
|
||||
%global bootstrap_date 2021-06-17
|
||||
|
||||
# Only the specified arches will use bootstrap binaries.
|
||||
#global bootstrap_arches %%{rust_arches}
|
||||
|
|
@ -21,7 +21,11 @@
|
|||
# Define a space-separated list of targets to ship rust-std-static-$triple for
|
||||
# cross-compilation. The packages are noarch, but they're not fully
|
||||
# reproducible between hosts, so only x86_64 actually builds it.
|
||||
%ifarch x86_64
|
||||
#ifarch x86_64
|
||||
# FIX: Except on RHEL8 modules, we can't filter a noarch package from shipping
|
||||
# on certain arches, namely s390x for its lack of lld. So we need to make it an
|
||||
# arch-specific package only for the supported arches.
|
||||
%ifnarch s390x
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%global cross_targets wasm32-unknown-unknown
|
||||
%endif
|
||||
|
|
@ -62,7 +66,7 @@
|
|||
%endif
|
||||
|
||||
Name: rust
|
||||
Version: 1.53.0
|
||||
Version: 1.54.0
|
||||
Release: 2%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
|
|
@ -292,7 +296,8 @@ written in Rust.
|
|||
local s = string.gsub([[
|
||||
%package std-static-{{triple}}
|
||||
Summary: Standard library for Rust
|
||||
BuildArch: noarch
|
||||
# FIX: we can't be noarch while excluding s390x for lack of lld
|
||||
# BuildArch: noarch
|
||||
{{requires}}
|
||||
|
||||
%description std-static-{{triple}}
|
||||
|
|
@ -611,6 +616,9 @@ for triple in %{cross_targets}; do
|
|||
done
|
||||
%endif
|
||||
|
||||
# These are transient files used by x.py dist and install
|
||||
rm -rf ./build/dist/ ./build/tmp/
|
||||
|
||||
# Make sure the shared libraries are in the proper libdir
|
||||
%if "%{_libdir}" != "%{common_libdir}"
|
||||
mkdir -p %{buildroot}%{_libdir}
|
||||
|
|
@ -682,8 +690,13 @@ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
|
|||
export %{rust_env}
|
||||
|
||||
# The results are not stable on koji, so mask errors and just log it.
|
||||
# Some of the larger test artifacts are manually cleaned to save space.
|
||||
%{python} ./x.py test --no-fail-fast --stage 2 || :
|
||||
rm -rf "./build/%{rust_triple}/test/"
|
||||
|
||||
%{python} ./x.py test --no-fail-fast --stage 2 cargo || :
|
||||
rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
|
||||
|
||||
%{python} ./x.py test --no-fail-fast --stage 2 clippy || :
|
||||
%{python} ./x.py test --no-fail-fast --stage 2 rls || :
|
||||
%{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :
|
||||
|
|
@ -816,6 +829,12 @@ end}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 17 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
|
||||
- Make std-static-wasm* arch-specific to avoid s390x.
|
||||
|
||||
* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
|
||||
- Update to 1.54.0.
|
||||
|
||||
* Tue Jul 20 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
|
||||
- Use llvm-ranlib to fix wasm archives.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue