diff --git a/.gitignore b/.gitignore index 48c7a41..cc7d9d1 100644 --- a/.gitignore +++ b/.gitignore @@ -170,3 +170,11 @@ /rust-1.30.0-s390x-unknown-linux-gnu.tar.xz /rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz /rustc-1.31.1-src.tar.xz +/rustc-1.32.0-src.tar.xz +/rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz +/rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.31.1-i686-unknown-linux-gnu.tar.xz +/rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.31.1-s390x-unknown-linux-gnu.tar.xz +/rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz diff --git a/0001-lldb_batchmode.py-try-import-_thread-for-Python-3.patch b/0001-lldb_batchmode.py-try-import-_thread-for-Python-3.patch new file mode 100644 index 0000000..78b84c2 --- /dev/null +++ b/0001-lldb_batchmode.py-try-import-_thread-for-Python-3.patch @@ -0,0 +1,33 @@ +From d9ddc39052c91568936427e3dee087b608140cf4 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Tue, 8 Jan 2019 13:19:50 -0800 +Subject: [PATCH] lldb_batchmode.py: try `import _thread` for Python 3 + +--- + src/etc/lldb_batchmode.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/etc/lldb_batchmode.py b/src/etc/lldb_batchmode.py +index 6b4c44806740..537b419b3279 100644 +--- a/src/etc/lldb_batchmode.py ++++ b/src/etc/lldb_batchmode.py +@@ -18,10 +18,15 @@ import lldb + import os + import sys + import threading +-import thread + import re + import time + ++try: ++ import thread ++except ModuleNotFoundError: ++ # The `thread` module was renamed to `_thread` in Python 3. ++ import _thread as thread ++ + # Set this to True for additional output + DEBUG_OUTPUT = False + +-- +2.20.1 + diff --git a/rust.spec b/rust.spec index 44dae55..e6ff826 100644 --- a/rust.spec +++ b/rust.spec @@ -54,7 +54,7 @@ Name: rust Version: 1.32.0 -Release: 0.1.beta.12%{?dist} +Release: 2%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -71,6 +71,9 @@ Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz # https://github.com/rust-dev-tools/rls-analysis/pull/160 Patch1: 0001-Try-to-get-the-target-triple-from-rustc-itself.patch +# https://github.com/rust-lang/rust/pull/57453 +Patch2: 0001-lldb_batchmode.py-try-import-_thread-for-Python-3.patch + # Get the Rust triple for any arch. %{lua: function rust_triple(arch) local abi = "gnu" @@ -401,6 +404,7 @@ test -f '%{local_rust_root}/bin/rustc' pushd vendor/rls-analysis %patch1 -p1 popd +%patch2 -p1 %if "%{python}" == "python3" sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure @@ -681,8 +685,11 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog -* Wed Jan 09 2019 Josh Stone - 1.32.0-0.1.beta.12 -- beta test +* Sat Feb 02 2019 Fedora Release Engineering - 1.32.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 17 2019 Josh Stone - 1.32.0-1 +- Update to 1.32.0. * Mon Jan 07 2019 Josh Stone - 1.31.1-9 - Update to 1.31.1 for RLS fixes. diff --git a/sources b/sources index 9da4e0a..6e7d3bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.31.1-src.tar.xz) = d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02 +SHA512 (rustc-1.32.0-src.tar.xz) = 487c405fed6430f62d2d0c38b65f6223b1c5074c7a0d3734dc8b3bb72fca255f5727e49541749569713a0c3e9a67eff574ba5698e8dceca6f0ef20b50f99aa42 diff --git a/sources-bootstrap b/sources-bootstrap index 2226688..2904e91 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,8 +1,8 @@ -SHA512 (rustc-1.31.1-src.tar.xz) = d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02 -SHA512 (rust-1.30.0-aarch64-unknown-linux-gnu.tar.xz) = 47459ea5a92418fdbfed9517d2ca741d02d8342e87e8b0e191103ff5407e39da917534445008a036cf043f0e8aff15a5d8c1884b0144ce4022f626fcfb5a46c6 -SHA512 (rust-1.30.0-armv7-unknown-linux-gnueabihf.tar.xz) = c2849807e1fd37dc175ea4e41345076f5b24944471c191539b625eb59183d899c1f416b99bac8365ead20d2b49ede4254ccf39dc8006e17721a031f11fa42348 -SHA512 (rust-1.30.0-i686-unknown-linux-gnu.tar.xz) = 76542f5d1f030696c6fb2aea6d4d7d3cb5739a16b7ce38f85cd7295d8f5ff1f1854266a5d30830898ab2fc06030be10d70f246c1391f241b8d9cba243d9ff992 -SHA512 (rust-1.30.0-powerpc64le-unknown-linux-gnu.tar.xz) = 18095b68c6a5a4be32d4ad3413a251fe570c22d2c793852de6247fde5e061fc6d77bbcd812fff7e5bae7361c9588d7e41ef89ad791da678c89763acddc06a88f -SHA512 (rust-1.30.0-powerpc64-unknown-linux-gnu.tar.xz) = 8d371215eb3ba6b2f1fa9cc05ede5dd1cac873c82dde0f508f962cd27a13b15b814a6a9fdbce92b524dcebbb19294cd607c29d2d123cde1daefb61cd57090010 -SHA512 (rust-1.30.0-s390x-unknown-linux-gnu.tar.xz) = 19a2f218b3104cfa5e5578365cc9927c818ddf721e4e8eb381bba1bd182fdefd9ad085ba4cbe8248fdbf5b173081ca1a2648b5be5fad62a0a324c3ade7f21ae7 -SHA512 (rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz) = 09d272bcc5b062815135d64441162b737078799328418adc4a4734fee69fcb9ad6abcbdc77b399688998481f0453915231b8b6d31b1d4066ac578035272c19f0 +SHA512 (rustc-1.32.0-src.tar.xz) = 487c405fed6430f62d2d0c38b65f6223b1c5074c7a0d3734dc8b3bb72fca255f5727e49541749569713a0c3e9a67eff574ba5698e8dceca6f0ef20b50f99aa42 +SHA512 (rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz) = c45aebda96a2df0e24efc7dc75cb913f6f92f6214582863367f3556a335d9a5ddf5bb487cb33dee7a48ab1d4dc986bd1fcf32f85b75d07558b1d18d89b26fd30 +SHA512 (rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz) = 78b1681f44274c9a0bf62c7646c5a2c85164c5f4dd4349a757b512dd82d435a4f2779c4b6653c8c3f66986512438d1b23e4af15defbbe9f489c0119141ef1942 +SHA512 (rust-1.31.1-i686-unknown-linux-gnu.tar.xz) = ee2c2bb2c1bb0f6e7f8eaeb4b2f0a8de7f53e8da675ec05cb56cab9bc4faa18b7075f5843226d7f9459e1208cc3fb1b90c65063b4a5a3828b04f8ff3c93ebe39 +SHA512 (rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz) = e64f586b632b85d07e18c61e5ce18a69404d89e302ecd8b4495e09e2b2f62bd3f32455b3d0d81cfa2d0031c003f23797421587cf6f314ce5b18b12157e1e9a3b +SHA512 (rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz) = 9a4427735e345d5e8f860ceab497c0ea3efd001c04322f5d2ecf0d5ac76e27feb1a247bb42662446ae39bf52eca75455b01a4c27341d6241406aa6feab1d1d4b +SHA512 (rust-1.31.1-s390x-unknown-linux-gnu.tar.xz) = ce6999f7d27468143a9a288fd1bda9f3ec42475f8b8473518be41358a2144317abf8076ed9527a10db94b5b89cf920f04217ce7a78ec214aa3e073a8419675bc +SHA512 (rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz) = 3bf37bc419acd7820c7e33d7b44e6cba7f3b556ca8880fee2f65b1648596f069e0bc590a3a7acc10c60a0328f83787a172650d9c26cf21aa14782dcd9a97ec3a