upgpkg: pulldown-cmark 0.9.3-3

Touchoup Rust build for multi-arch

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f35e93fe347c..e9ef794a92c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pulldown-cmark
 	pkgdesc = Pull parser for CommonMark, written in Rust
 	pkgver = 0.9.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/raphlinus/pulldown-cmark
 	arch = x86_64
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 836af649dbf8..ae747976de78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,37 +5,41 @@
 
 pkgname=pulldown-cmark
 pkgver=0.9.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Pull parser for CommonMark, written in Rust'
-arch=('x86_64')
-url=https://github.com/raphlinus/pulldown-cmark
-license=('MIT')
-depends=('gcc-libs')
-makedepends=('rust')
-source=("$pkgname-$pkgver.tar.gz::https://static.crates.io/crates/$pkgname/$pkgname-$pkgver.crate")
+arch=(x86_64)
+url="https://github.com/raphlinus/$pkgname"
+license=(MIT)
+depends=(gcc-libs)
+makedepends=(rust)
+_archive="$pkgname-$pkgver"
+source=("$_archive.tar.gz::https://static.crates.io/crates/$pkgname/$pkgname-$pkgver.crate")
 sha512sums=('2f5acf1b6f345ea2f82c6daeb4b73c93c2772dcfb7ccff6fba9e51b8840b0662202eb3bd1c917f8f81be1ba86b58fb3d5f87616dbdca991e0ef6fc249dc888fe')
 b2sums=('0b4105a9452139865723a66e434804da7fec35771a90335debe579164ce7ddd78192949db77ad5427ff80b44805a8fa5ca497e6b4111344aaa014faaa508904f')
 
 prepare() {
-  cd $pkgname-$pkgver
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cd "$_archive"
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
-build() {
-  cd $pkgname-$pkgver
+_srcenv() {
+  cd "$_archive"
   export RUSTUP_TOOLCHAIN=stable
   export CARGO_TARGET_DIR=target
+}
+
+build() {
+  _srcenv
   cargo build --frozen --release
 }
 
 check() {
-  cd $pkgname-$pkgver
-  export RUSTUP_TOOLCHAIN=stable
+  _srcenv
   cargo test --frozen
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "$_archive"
   install -Dt "$pkgdir"/usr/bin target/release/$pkgname
   install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
 }