From b50abb20118f15a4b09bcadd8a6af7f3ed0944d3 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 17 Dec 2022 13:23:13 +0100 Subject: [PATCH] rust: disable miri patch --- mingw-w64-rust/0012-disable-miri.patch | 15 +++++++++++++++ mingw-w64-rust/PKGBUILD | 9 ++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-rust/0012-disable-miri.patch diff --git a/mingw-w64-rust/0012-disable-miri.patch b/mingw-w64-rust/0012-disable-miri.patch new file mode 100644 index 0000000000..e25ad4b026 --- /dev/null +++ b/mingw-w64-rust/0012-disable-miri.patch @@ -0,0 +1,15 @@ +--- rustc-1.66.0-src/src/bootstrap/install.rs.orig 2022-12-17 13:15:51.067932500 +0100 ++++ rustc-1.66.0-src/src/bootstrap/install.rs 2022-12-17 13:16:15.631649500 +0100 +@@ -200,10 +200,8 @@ + install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball); + }; + Miri, alias = "miri", Self::should_build(_config), only_hosts: true, { +- let tarball = builder +- .ensure(dist::Miri { compiler: self.compiler, target: self.target }) +- .expect("missing miri"); +- install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball); ++ let _tarball = builder ++ .ensure(dist::Miri { compiler: self.compiler, target: self.target }); + }; + Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, { + if let Some(tarball) = builder.ensure(dist::Rustfmt { diff --git a/mingw-w64-rust/PKGBUILD b/mingw-w64-rust/PKGBUILD index 308bcbe7ec..1678afdb2c 100644 --- a/mingw-w64-rust/PKGBUILD +++ b/mingw-w64-rust/PKGBUILD @@ -41,7 +41,8 @@ source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz"{, "0008-disable-self-contained.patch" "0009-build-gnullvm-targets-natively.patch" "0010-gnullvm-debuginfo-fix.patch" - "0011-disable-uac-for-installer.patch") + "0011-disable-uac-for-installer.patch" + "0012-disable-miri.patch") sha256sums=('3b3cd3ea5a82a266e75d0b35f0b54c16021576d9eb78d384052175a772935a48' 'SKIP' '7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0' @@ -51,7 +52,8 @@ sha256sums=('3b3cd3ea5a82a266e75d0b35f0b54c16021576d9eb78d384052175a772935a48' 'a214cd8394ab7416fd170c7fa05daf701a5357d38e4e54149370e6efff208e50' '394424aca9553802db667c3fd5cb60a5fb814ac66c5617426a5e78d1ba10d8bf' '84d72369303f377127a5614505c2662b530415246833569030c2578368ee070f' - 'e72ee077cd62bfc24c592a12ca27242d24ee14237d414c7e8fc4004bf8b031b8') + 'e72ee077cd62bfc24c592a12ca27242d24ee14237d414c7e8fc4004bf8b031b8' + 'd63aaef586b08aa645ecf94165baf3c40aa7fdd3f266a5728fcf06c2a9d37f73') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg @@ -92,7 +94,8 @@ prepare() { 0004-unbundle-gcc.patch \ 0005-win32-config.patch \ 0008-disable-self-contained.patch \ - 0010-gnullvm-debuginfo-fix.patch + 0010-gnullvm-debuginfo-fix.patch \ + 0012-disable-miri.patch if [[ $MINGW_PACKAGE_PREFIX == *-clang-i686 || $MINGW_PACKAGE_PREFIX == *-clang-x86_64 ]]; then apply_patch_with_msg \