Date: Saturday, August 7, 2021 @ 10:52:22 Author: alerque Revision: 994645
Fetch before build; avoid overrides irrelevant to chroot builds Modified: git-delta/trunk/PKGBUILD ----------+ PKGBUILD | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-07 10:48:04 UTC (rev 994644) +++ PKGBUILD 2021-08-07 10:52:22 UTC (rev 994645) @@ -1,4 +1,5 @@ # Maintainer: George Rawlinson <grawlin...@archlinux.org> +# Maintainer: Caleb Maclennan <ca...@alerque.com> # Contributor: Kr1ss $(echo \<kr1ss+x-yandex+com\>|sed s/\+/./g\;s/\-/@/) # Contributor : ccorn @@ -5,13 +6,13 @@ pkgname=git-delta _pkgname=delta pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc='Syntax-highlighting pager for git and diff output' arch=('x86_64') url="https://github.com/dandavison/delta" license=('MIT') depends=('libgit2') -makedepends=('rust') +makedepends=('cargo') checkdepends=('git') optdepends=( 'bash-completion: for shell auto-completion' @@ -21,9 +22,14 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") b2sums=('a27fe07538acfd6346bc12f2e4ad03396737e268ce4653b25c908fbcc7bb47fe2ed76550dc431ab80bf9ab86746d4cd9b551ea68a47e603ae9fe99aa935df7bf') +prepare() { + cd "$_pkgname-$pkgver" + cargo fetch --locked --target "$CARCH-unknown-linux-gnu" +} + build() { cd "$_pkgname-$pkgver" - RUSTUP_TOOLCHAIN=stable cargo build --release --locked --all-features --target-dir=target + cargo build --frozen --release --all-features } check() { @@ -30,12 +36,12 @@ cd "$_pkgname-$pkgver" # some tests hang for 60+ seconds, find out why # took my machine ~ 470 seconds - RUSTUP_TOOLCHAIN=stable cargo test --locked --target-dir=target + cargo test --frozen --all-features } package() { cd "$_pkgname-$pkgver" - + # binary install -vDm755 -t "$pkgdir/usr/bin" target/release/delta