From 9b13987c61950b065019ca7fbf39257b38a27dbb Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sun, 2 Aug 2020 10:16:54 +0200
Subject: extra/rust: another try bootstrapping 1.45.1 from rust-bin 1.44.1

---
 extra/rust/PKGBUILD                             |  21 +++------------------
 extra/rust/rustc-1.42.0-src-typenum-U1024.patch | Bin 4069 -> 0 bytes
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 extra/rust/rustc-1.42.0-src-typenum-U1024.patch

diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD
index c9ecd6b7..3b1829ad 100644
--- a/extra/rust/PKGBUILD
+++ b/extra/rust/PKGBUILD
@@ -29,7 +29,7 @@ if [ "${CARCH}" != 'pentium4' ]; then
       sed '
         $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs"
         $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
+        $ i sed -i "s/7dd6e3219a9d324f6f44dc230261df116995de5a02d0d12770490eb3e7b4df75/21c1ae9e514c828baae1b8b723d06515eb60289d02f390e6a38c2c9d6fc3bde0/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
       '
   )"
 fi
@@ -60,25 +60,10 @@ eval "$(
     '
 )"
 
-# work around P1024, U1024 typenum bug for old rust releases (bundled
-# typenum version contains a buggy version)
-if [ "${CARCH}" = "i686" ]; then
-  source+=('rustc-1.42.0-src-typenum-U1024.patch')
-  sha256sums+=('716e5fad9b8bda690856d36f33359da26a4c258bb5e8ffd635898697177dc4de')
-  eval "$(
-    declare -f prepare | \
-      sed '
-        /}/ i \
-          patch -Np1 < "$srcdir/rustc-1.42.0-src-typenum-U1024.patch"
-      '
-  )"
-
-fi
-
 # Enable on demand, if your previous rust is broken use previous version
 # from build-support
-#makedepends=(${makedepends[@]//rust/})
-#makedepends+=('rust141')
+makedepends=(${makedepends[@]//rust/})
+makedepends+=('rust-bin')
 
 # rust 1.41 is built against llvm 9.0, so force that in as a make dependency
 #makedepends+=('llvm9-libs')
diff --git a/extra/rust/rustc-1.42.0-src-typenum-U1024.patch b/extra/rust/rustc-1.42.0-src-typenum-U1024.patch
deleted file mode 100644
index ea23980b..00000000
Binary files a/extra/rust/rustc-1.42.0-src-typenum-U1024.patch and /dev/null differ
-- 
cgit v1.2.3-54-g00ecf