From b0486c505188f77fa282536b28a9fffb574dd47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Sun, 10 May 2020 18:40:59 +0300 Subject: [PATCH] Updated files --- 0001-Drop-cfg-bootstrap-code.patch | 25 ------------------------- rust.spec | 6 +++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 0001-Drop-cfg-bootstrap-code.patch diff --git a/0001-Drop-cfg-bootstrap-code.patch b/0001-Drop-cfg-bootstrap-code.patch deleted file mode 100644 index 3d8f202..0000000 --- a/0001-Drop-cfg-bootstrap-code.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Fri, 31 Jan 2020 12:30:17 -0500 -Subject: [PATCH] Drop cfg(bootstrap) code - ---- - src/bootstrap/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 1fee3fd9ac1d..637323331f58 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -1026,7 +1026,7 @@ impl Build { - } - - fn llvm_link_tools_dynamically(&self, target: Interned) -> bool { -- (target.contains("linux-gnu") || target.contains("apple-darwin")) -+ target.contains("linux-gnu") || target.contains("apple-darwin") - } - - /// Returns the `version` string associated with this compiler for Rust --- -2.24.1 - diff --git a/rust.spec b/rust.spec index 2af44ba..764a6e9 100644 --- a/rust.spec +++ b/rust.spec @@ -66,7 +66,7 @@ Summary: The Rust Programming Language Name: rust Version: 1.43.0 -Release: 1 +Release: 2 License: (ASL 2.0 or MIT) and (BSD and MIT) Group: Development/Rust # ^ written as: (rust itself) and (bundled libraries) @@ -174,7 +174,7 @@ for %{name}-gdb and %{name}-lldb. %dir %{rustlibdir} %dir %{rustlibdir}/etc %{rustlibdir}/etc/debugger_*.py* -%if %rpm4 +%if %{mdvver} >= 201910 %{rustlibdir}/etc/__pycache__/debugger_*.py* %endif @@ -197,7 +197,7 @@ which allows easier debugging of Rust programs. %doc README.md COPYRIGHT LICENSE-APACHE LICENSE-MIT %{_bindir}/rust-gdb %{rustlibdir}/etc/gdb_*.py* -%if %rpm4 +%if %{mdvver} >= 201910 %{rustlibdir}/etc/__pycache__/gdb_*.py* %endif # %%exclude - No work!