[arch-commits] Commit in rustup/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Tuesday, April 27, 2021 @ 23:28:20
  Author: svenstaro
Revision: 924852

upgpkg: rustup 1.24.0-2: Fix broken tool installations

Modified:
  rustup/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-27 23:07:42 UTC (rev 924851)
+++ PKGBUILD	2021-04-27 23:28:20 UTC (rev 924852)
@@ -3,7 +3,7 @@
 # Contributor: Jon Gjengset <jon at tsp.io>
 pkgname=rustup
 pkgver=1.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Rust toolchain installer"
 arch=('x86_64')
 url="https://github.com/rust-lang/rustup.rs"
@@ -16,12 +16,22 @@
 conflicts=('rust' 'cargo' 'rustfmt')
 replaces=('cargo-tree')
 install='post.install'
-source=("rustup-${pkgver}.tar.gz::https://github.com/rust-lang/rustup.rs/archive/${pkgver}.tar.gz")
-sha512sums=('621cc857a4aa74160c3267cd6aa5f8211d137e09498b4086124013eed031f878fa0e242c8b26077c7d5f4575ca71c057b2a904b982382940a941a974d3dc77bf')
+source=("rustup-${pkgver}.tar.gz::https://github.com/rust-lang/rustup.rs/archive/${pkgver}.tar.gz"
+        https://github.com/rust-lang/rustup/pull/2738.patch
+        https://github.com/rust-lang/rustup/pull/2740.patch)
+sha512sums=('621cc857a4aa74160c3267cd6aa5f8211d137e09498b4086124013eed031f878fa0e242c8b26077c7d5f4575ca71c057b2a904b982382940a941a974d3dc77bf'
+            'bef42c5e7c39d378ede844c3517adda14a2d765e8aea90b93e8f21152978fdb49b270d66f65ead4eb11ce566fb54be6df5ceccc6959c934ce377053d90563c44'
+            '06f1a738b480f513d8431a9f6fcd973a2a076ac3dfbb10102227d145613529e9899107b15989a92af80745c11b16cbe474f93acd8af2ca2de53aabfc694aa335')
 _binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri')
 
+prepare() {
+    cd "$pkgname-${pkgver}"
+    patch -Np1 -i "${srcdir}"/2738.patch
+    patch -Np1 -i "${srcdir}"/2740.patch
+}
+
 build() {
-    cd "$srcdir/$pkgname-${pkgver}"
+    cd "$pkgname-${pkgver}"
     cargo build --release --features no-self-update --bin rustup-init
 }