summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Smedstad2024-02-25 11:48:07 +0100
committerCarl Smedstad2024-02-25 11:56:57 +0100
commit60753a596b45a5553be63baeaab9c93a394fbeda (patch)
treeb9d1cc4f540e7eabf80f46e48b7b836d859daa68
parent45e6b99b1a30bfc50b9be47a8b416571c188a0c9 (diff)
downloadaur-60753a596b45a5553be63baeaab9c93a394fbeda.tar.gz
upgpkg: 1.8.1-1
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD37
2 files changed, 28 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1b64a41c0be..efdbaad8c386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = jd-tool
pkgdesc = JSON diff and patch
- pkgver = 1.7.1
+ pkgver = 1.8.1
pkgrel = 1
url = https://github.com/josephburnett/jd
arch = x86_64
arch = aarch64
license = MIT
makedepends = go
- source = jd-tool-1.7.1.tar.gz::https://github.com/josephburnett/jd/archive/refs/tags/v1.7.1.tar.gz
- sha256sums = 3d0b693546891bab41ca5c3be859bc760631608c9add559aa561fb751cdd1c92
+ depends = glibc
+ source = jd-tool-1.8.1.tar.gz::https://github.com/josephburnett/jd/archive/refs/tags/v1.8.1.tar.gz
+ sha256sums = 40635f27543f91e656b902b94a2d6e9f4ed627b940484ad59b18fc7fe458f4a9
pkgname = jd-tool
diff --git a/PKGBUILD b/PKGBUILD
index 9fc1c91707f6..db6f80465bbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,53 @@
pkgname=jd-tool
_pkgname=jd
-pkgver=1.7.1
+pkgver=1.8.1
pkgrel=1
pkgdesc="JSON diff and patch"
arch=(x86_64 aarch64)
url="https://github.com/josephburnett/jd"
license=(MIT)
+depends=(glibc)
makedepends=(go)
-
source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('3d0b693546891bab41ca5c3be859bc760631608c9add559aa561fb751cdd1c92')
+sha256sums=('40635f27543f91e656b902b94a2d6e9f4ed627b940484ad59b18fc7fe458f4a9')
_archive="$_pkgname-$pkgver"
-build() {
+prepare() {
cd "$_archive"
- mkdir -p build/
+ # Avoid downloading Go dependencies in build() by doing it here instead
+ go mod download -x
+}
+
+build() {
+ cd "$_archive"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
+ export CGO_CPPFLAGS="$CPPFLAGS"
+ export CGO_CFLAGS="$CFLAGS"
+ export CGO_CXXFLAGS="$CXXFLAGS"
+ export CGO_LDFLAGS="$LDFLAGS"
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
- go build -v -o build/jd main.go
+ go build -v -buildvcs=false
}
check() {
cd "$_archive"
- go test ./lib/...
+ local unit_tests=$(
+ go list ./... \
+ | grep -v github.com/josephburnett/jd/web/ui \
+ | sort
+ )
+ # shellcheck disable=2086
+ go test $unit_tests
}
package() {
cd "$_archive"
- install -Dm755 "build/jd" "$pkgdir/usr/bin/jd"
- install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/jd/LICENSE"
+ install -Dm755 -t "$pkgdir/usr/bin" jd
+ install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE
}