Merge branch 'master' into f28

.gitignore

@@ -123,3 +123,4 @@
 /rust-1.25.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.26.1-src.tar.xz
+/rustc-1.26.2-src.tar.xz

rust.spec

@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.26.1
+%global rustc_version 1.26.2
 %global cargo_version 1.26.0
 %global rustfmt_version 0.4.2
 %global rls_version 0.126.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -421,6 +421,13 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
 find src/vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
 
+%if 0%{?fedora} >= 29
+  # gdb-8.1.50 snapshots are hanging our debuginfo-gdb tests on 32-bit platforms,
+  # so just skip these tests for now...
+  sed -i.gdb-hang -e '/Skip debuginfo/a if mode == "debuginfo-gdb" { return; }' \
+    src/bootstrap/test.rs
+%endif
+
 
 %build
 
@@ -438,7 +445,7 @@ export LIBGIT2_SYS_USE_PKG_CONFIG=1
 %global common_libdir %{_prefix}/lib
 %global rustlibdir %{common_libdir}/rustlib
 
-%ifarch %{arm}
+%ifarch %{arm} %{ix86}
 # full debuginfo is exhausting memory; just do libstd for now
 # https://github.com/rust-lang/rust/issues/45854
 %define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
@@ -648,6 +655,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Wed Jun 06 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
+- Update to 1.26.2.
+
 * Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
 - Update to 1.26.1.
 

sources

@@ -1 +1 @@
-SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
+SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0

sources-bootstrap

@@ -1,4 +1,4 @@
-SHA512 (rustc-1.26.1-src.tar.xz) = 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
+SHA512 (rustc-1.26.2-src.tar.xz) = a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
 SHA512 (rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz) = 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
 SHA512 (rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz) = 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
 SHA512 (rust-1.25.0-i686-unknown-linux-gnu.tar.xz) = 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f