rpms
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into epel7

This commit is contained in:
Josh Stone 2019-08-15 16:17:50 -07:00
parent 0d9e250f39 b93df249e6
commit 9d647b418c
4 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -214,3 +214,11 @@
/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz
/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz
/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz
/rustc-1.37.0-src.tar.xz
/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz
/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz
/rust-1.36.0-i686-unknown-linux-gnu.tar.xz
/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz
/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz
/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz
/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz

50
rust.spec
View File

@ -9,10 +9,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.35.0
%global bootstrap_cargo 1.35.0
%global bootstrap_channel 1.35.0
%global bootstrap_date 2019-05-23
%global bootstrap_rust 1.36.0
%global bootstrap_cargo 1.36.0
%global bootstrap_channel 1.36.0
%global bootstrap_date 2019-07-04
# Only the specified arches will use bootstrap binaries.
#global bootstrap_arches %%{rust_arches}
@ -48,7 +48,7 @@
%endif
Name: rust
Version: 1.36.0
Version: 1.37.0
Release: 1%{?dist}
Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and MIT)
@ -285,7 +285,7 @@ its standard library.
%package -n cargo
Summary: Rust's package manager and build tool
%if %with bundled_libgit2
Provides: bundled(libgit2) = 0.27
Provides: bundled(libgit2) = 0.28.2
%endif
%if %with bundled_libssh2
Provides: bundled(libssh2) = 1.8.1~dev
@ -295,6 +295,11 @@ BuildRequires: git
# Cargo is not much use without Rust
Requires: rust
# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and
# Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too
Obsoletes: cargo-vendor <= 0.1.23
Provides: cargo-vendor = %{version}-%{release}
%description -n cargo
Cargo is a tool that allows Rust projects to declare their various dependencies
and ensure that you'll always get a repeatable build.
@ -326,7 +331,7 @@ A tool for formatting Rust code according to style guidelines.
%package -n rls
Summary: Rust Language Server for IDE integration
%if %with bundled_libgit2
Provides: bundled(libgit2) = 0.27
Provides: bundled(libgit2) = 0.28.2
%endif
%if %with bundled_libssh2
Provides: bundled(libssh2) = 1.8.1~dev
@ -404,6 +409,24 @@ rm -rf src/llvm-project/
# We never enable emscripten.
rm -rf src/llvm-emscripten/
# Remove other unused vendored libraries
rm -rf vendor/curl-sys/curl/
rm -rf vendor/jemalloc-sys/jemalloc/
rm -rf vendor/libz-sys/src/zlib/
rm -rf vendor/lzma-sys/xz-*/
rm -rf vendor/openssl-src/openssl/
%if %without bundled_libgit2
rm -rf vendor/libgit2-sys/libgit2/
%endif
%if %without bundled_libssh2
rm -rf vendor/libssh2-sys/libssh2/
%endif
# This only affects the transient rust-installer, but let it use our dynamic xz-libs
sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
# rename bundled license for packaging
cp -a vendor/backtrace-sys/src/libbacktrace/LICENSE{,-libbacktrace}
@ -453,12 +476,12 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
%if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
# Older rpmbuild didn't work with partial debuginfo coverage.
%global debug_package %{nil}
%define enable_debuginfo --disable-debuginfo --disable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
%define enable_debuginfo --debuginfo-level=0
%else
%define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
%endif
%else
%define enable_debuginfo --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines
%define enable_debuginfo --debuginfo-level=2
%endif
# We want the best optimization for std, but it caused problems for rpm-ostree
@ -471,6 +494,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
%configure --disable-option-checking \
--libdir=%{common_libdir} \
--build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
--python=%{python} \
--local-rust-root=%{local_rust_root} \
%{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
%{!?llvm_has_filecheck: --disable-codegen-tests} \
@ -676,6 +700,12 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
%changelog
* Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
- Update to 1.37.0.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
- Update to 1.36.0.

2
sources
View File

@ -1 +1 @@
SHA512 (rustc-1.36.0-src.tar.xz) = 1adbb3b67d599f926dc19258e2596cb3b990e152e75e71645637098526207aa5632d7915fd5b67c7a045f63860cc7be3d28be014ad6141a342adc16b2fe8a879
SHA512 (rustc-1.37.0-src.tar.xz) = bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4

16
sources-bootstrap
View File

@ -1,8 +1,8 @@
SHA512 (rustc-1.36.0-src.tar.xz) = 1adbb3b67d599f926dc19258e2596cb3b990e152e75e71645637098526207aa5632d7915fd5b67c7a045f63860cc7be3d28be014ad6141a342adc16b2fe8a879
SHA512 (rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz) = 9231e4acf26dc19a31c6c9623c939eafd0fdefc18debb8569baae36d3ad3410e21097ae2306b5adc48bc5e219da1dc1df38569e1d0ae9b0178d5a2e815c20db8
SHA512 (rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz) = 4d80fdc7483566999d8c38b6772c1f1c6cf0f537f68bff9dd9ed68931afab569e02fc9d5ed2999fb1d3478113527840676d903630f93c3d79c30fdba0b98a2bb
SHA512 (rust-1.35.0-i686-unknown-linux-gnu.tar.xz) = 33a603f638ced850c4572cc81041b1ab47d95a062c66ea24695e449cca7ac6353757c794a85af4a15e43e0ce091c7cc47dbd01fd30e23e1bae6ced194a08a667
SHA512 (rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz) = 3b63dac50a92693d13066aa6e96de05fceb2da6c07834adfab8c12e6a78f59051dfa008062b1d2ad410a009e2164fc716d689231e552379e419161d1620d0066
SHA512 (rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz) = a89094b58ffdb4940e51c4c2e5f5efa094d7d6c1a2b2382397dbfb05eeaf99e9329a8e7c51da602a6b8935ebb4f6df475a1873748139d9f9a97b8bd40c49849b
SHA512 (rust-1.35.0-s390x-unknown-linux-gnu.tar.xz) = 11539eb25e474bbaa8e57f21c3f64506859bc86baec74df24bb4aaf5361745840b82ff715fc54fbd6ba654a8f7fd4f064af0538b983dd489cd69498bd70d1bf7
SHA512 (rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz) = 49976ac2fbac5b1709c4a7f3785eb99ab827464ec4d99ee7190df16c3be23e98de606566b57df2231a15097c7fe984e0d19496ce7478ccc1f0f2c7aeb32ecb04
SHA512 (rustc-1.37.0-src.tar.xz) = bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4
SHA512 (rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz) = 77ffd9aa0dfdbb886a51c8d17e3e348c777226e859a48374dad8be20b9a3c7130c7f46d9173753e4ac4a264b45610767ba2625df4192773913892a13a255d3d6
SHA512 (rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz) = b31e34f44df17d89f9f2a609a5b5b2320f43691e06ead257d893766abf8764a158adff0265dd60bf1f63dd98f0bf6bc64ae3b9e9f45200fbd7dfcaec3ba85d01
SHA512 (rust-1.36.0-i686-unknown-linux-gnu.tar.xz) = 34bcb93ec7a313a28ac20cd853e37419c4607f4035a367015826bd797401a2ada20ee99ae9028b6115c9db8aa1d4f74b74fb08ed09ab528d5946bc26c754b182
SHA512 (rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz) = 02f32b544b0a55ba6f6fc4852f18766107bc0ce2c50488db11605e8a10e5965dd44e8332905c00080b08576370f2f0297ecbe12ba9fe01b4c24cdb9fd03ad64f
SHA512 (rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz) = 20bdd2b427549c866343962abefc4ffc356a1cb6965c754f28f19b05c234cb9c0abccbce036013deba1dc7699c2889ec954fff2b944953385624be54ee7a733e
SHA512 (rust-1.36.0-s390x-unknown-linux-gnu.tar.xz) = c637b8f50cbce3333280f43ce4b97d3f75ddae429ee34461837c3c3869e20aed8c5e76f7a58998f617dc0ffc2e6afd00908e5de05f4c7ed9a8c34d5dbc7ce916
SHA512 (rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz) = 3f14dda1e09ef8c8168600f4d70ba60cb2a1086ad9edb5eed708d0ffc16fdb9c582ce350a93afcd64b78f87737e37d4f099703835a1ec9837a5721c2335e17c7