Djam/rust
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rust.git synced 2025-02-23 18:02:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from import/rust:rosa2019.1

Browse source 
Backports and update
This commit is contained in:
djam 2021-04-12 13:23:18 +00:00
commit ead0adbd1c
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.abf.yml
View file

@ -1,5 +1,5 @@
sources: sources:
rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz: 7facc09fc7a28c4607ef5a949e9eb5c0df932d68 rust-1.48.0-aarch64-unknown-linux-gnu.tar.xz: bd1b871f9b1b1f18eaab6efe0dbbbc9113abb6ce
rust-1.47.0-i686-unknown-linux-gnu.tar.xz: 674b389b9031dcc169f421590806a22114b649d0 rust-1.48.0-i686-unknown-linux-gnu.tar.xz: 171925897bf4bc76c409fca4065076c262fe3a6a
rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz: 60ff2f5cbfc8447b3262c5a99f466437fa7aa004 rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz: 209a18fd803e2ae04398a7df0e150623121e8758
rustc-1.48.0-src.tar.xz: 036f83df6255166cef0e2241ef0627e2568244b4 rustc-1.49.0-src.tar.xz: f6f4d4e41694935511097c3913d9f720d5e606f8

14
rust.spec
View file

@ -24,8 +24,8 @@
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD # or nightly wants some beta-YYYY-MM-DD
# Note that cargo matches the program version here, not its crate version. # Note that cargo matches the program version here, not its crate version.
%define bootstrap_rust 1.47.0 %define bootstrap_rust 1.48.0
%define bootstrap_cargo 1.47.0 %define bootstrap_cargo 1.48.0
%define bootstrap_date 2020-10-08 %define bootstrap_date 2020-10-08
%bcond_without bootstrap %bcond_without bootstrap
@ -64,7 +64,7 @@
Summary: The Rust Programming Language Summary: The Rust Programming Language
Name: rust Name: rust
Version: 1.48.0 Version: 1.49.0
Release: 1 Release: 1
License: (ASL 2.0 or MIT) and (BSD and MIT) License: (ASL 2.0 or MIT) and (BSD and MIT)
Group: Development/Rust Group: Development/Rust
@ -76,10 +76,6 @@ Source1: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-x86_64-unknown
Source2: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz Source2: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
Source3: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz Source3: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
Source10: rust.rpmlintrc Source10: rust.rpmlintrc
# https://github.com/rust-lang/backtrace-rs/pull/373
Patch1: 0001-use-NativeEndian-in-symbolize-gimli-Context.patch
# https://github.com/rust-lang/rust/pull/77777
Patch2: 0001-doc-disambiguate-stat-in-MetadataExt-as_raw_stat.patch
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: curl BuildRequires: curl
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
@ -359,9 +355,7 @@ test -f '%{local_rust_root}/bin/rustc'
%endif %endif
%setup -qn rustc-%{version}-src %setup -qn rustc-%{version}-src
%autopatch -p1
%patch1 -p1 -d library/backtrace
%patch2 -p1
# python3 # python3
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure