From 59bda43d25bb73308ce8d3d591792aab1724fc83 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Jun 2018 10:43:45 -0700 Subject: [PATCH 1/5] Update to 1.26.2. Re-bootstrap to deal with LLVM symbol changes. --- rust.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rust.spec b/rust.spec index c397e96..7707ee4 100644 --- a/rust.spec +++ b/rust.spec @@ -14,7 +14,7 @@ %global bootstrap_date 2018-03-29 # Only the specified arches will use bootstrap binaries. -#global bootstrap_arches %%{rust_arches} +%global bootstrap_arches %%{rust_arches} # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases. %bcond_with llvm_static @@ -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) @@ -648,6 +648,10 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Tue Jun 05 2018 Josh Stone - 1.26.2-3 +- Update to 1.26.2. +- Re-bootstrap to deal with LLVM symbol changes. + * Tue May 29 2018 Josh Stone - 1.26.1-2 - Update to 1.26.1. From b006a106003b36e9d805789a68c863c5d7d5e85c Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Jun 2018 10:46:32 -0700 Subject: [PATCH 2/5] new-sources --- .gitignore | 1 + sources | 9 ++++++++- sources-bootstrap | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1572f08..eed3814 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index 65f7575..8cdeea7 100644 --- a/sources +++ b/sources @@ -1 +1,8 @@ -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 +SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee +SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a +SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632 +SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78 diff --git a/sources-bootstrap b/sources-bootstrap index 6ce4a13..8cdeea7 100644 --- a/sources-bootstrap +++ b/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 From 43909be7e9617b0e4324876efdba679f3d58ed4c Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Jun 2018 12:06:03 -0700 Subject: [PATCH 3/5] reduce debuginfo on i686 too (LLVM ERROR: out of memory) --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 7707ee4..6c2adde 100644 --- a/rust.spec +++ b/rust.spec @@ -438,7 +438,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 From 44ab18b9a0c9259f50004947644d8de46e36b2e7 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Jun 2018 13:25:30 -0700 Subject: [PATCH 4/5] Temporarily disable debuginfo-gdb tests on rawhide --- rust.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rust.spec b/rust.spec index 6c2adde..69c1e88 100644 --- a/rust.spec +++ b/rust.spec @@ -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 From 820f98e2ae62718f0e6ab5ddb16cd831db85beed Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Jun 2018 21:36:55 -0700 Subject: [PATCH 5/5] Rebuild without bootstrap binaries. --- rust.spec | 7 +++++-- sources | 7 ------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rust.spec b/rust.spec index 69c1e88..0bbbcb9 100644 --- a/rust.spec +++ b/rust.spec @@ -14,7 +14,7 @@ %global bootstrap_date 2018-03-29 # Only the specified arches will use bootstrap binaries. -%global bootstrap_arches %%{rust_arches} +#global bootstrap_arches %%{rust_arches} # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases. %bcond_with llvm_static @@ -56,7 +56,7 @@ Name: rust Version: %{rustc_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -655,6 +655,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Tue Jun 05 2018 Josh Stone - 1.26.2-4 +- Rebuild without bootstrap binaries. + * Tue Jun 05 2018 Josh Stone - 1.26.2-3 - Update to 1.26.2. - Re-bootstrap to deal with LLVM symbol changes. diff --git a/sources b/sources index 8cdeea7..8d2168f 100644 --- a/sources +++ b/sources @@ -1,8 +1 @@ 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 -SHA512 (rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz) = f4a37b82a8cd2a9a50d6cc7db0b09513829388e72ab13e8b6d633a166c9f15fd3692d06131e8546636e9e6a8b7dae93345d063f88d64ab876da582d7156ebdee -SHA512 (rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz) = 853c7a009c2b5a80d625bad024faa92193041461213761a9d4bdf33d5bb958c4f81b966cb8af1a5abbde6d393650f74c6a18a5ba9f709bce04d0da4f0e15ee7a -SHA512 (rust-1.25.0-s390x-unknown-linux-gnu.tar.xz) = 864919cf590377f47c6fb11dec3f0b9999ca5db3c002d3f253efbb7ad268e5f0a7d6f590411fed14c2068f08fb100ae76c33a5165f689d98b0798e227cf22632 -SHA512 (rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz) = aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78