[packages/rust] no install miri patch no longer needed
atler
atler at pld-linux.org
Fri Feb 10 13:09:37 CET 2023
commit e661856762c86b65eb377ac3f0a82f5fe383a493
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Feb 10 13:05:37 2023 +0100
no install miri patch no longer needed
no-install-miri.patch | 11 -----------
rust.spec | 2 --
2 files changed, 13 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index db059f2..80db216 100644
--- a/rust.spec
+++ b/rust.spec
@@ -53,7 +53,6 @@ Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_ru
# Source4-md5: 3ad4208d29ca809073b43f96767e8b32
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
# Source5-md5: f091919a1e13f71db429b3af957bf361
-Patch0: no-install-miri.patch
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
@@ -341,7 +340,6 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
%prep
%setup -q -n %{rustc_package}
-%patch0 -p1
%if %{with bootstrap}
%ifarch %{x8664} x32
diff --git a/no-install-miri.patch b/no-install-miri.patch
deleted file mode 100644
index af1ed81..0000000
--- a/no-install-miri.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rustc-1.66.0-src/src/bootstrap/install.rs.orig 2022-12-12 17:02:12.000000000 +0100
-+++ rustc-1.66.0-src/src/bootstrap/install.rs 2022-12-18 00:01:24.076587533 +0100
-@@ -130,7 +130,7 @@
- impl $name {
- #[allow(dead_code)]
- fn should_build(config: &Config) -> bool {
-- config.extended && config.tools.as_ref()
-+ $path_or_alias != "miri" && config.extended && config.tools.as_ref()
- .map_or(true, |t| t.contains($path_or_alias))
- }
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/449de7a99645ce1bba11c59b7f64f871412a514e
More information about the pld-cvs-commit
mailing list