upgpkg: air 1.27.4-1

* New upstream release.
* Add dependency: glibc.
* General cleanup of PKGBUILD.

2 files changed, 36 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8af90a7b09eb..f9560787a9e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = air
 	pkgdesc = Live reload for Go apps
-	pkgver = 1.27.3
+	pkgver = 1.27.4
 	pkgrel = 1
 	url = https://github.com/cosmtrek/air
 	arch = x86_64
 	license = GPL3
 	makedepends = go
-	source = air-1.27.3.tar.gz::https://github.com/cosmtrek/air/archive/v1.27.3.tar.gz
-	sha512sums = 545d58c612573378062e94fa1d8c51e7109e58c80209a568db9ff206660912b6de0d3c52ab4b348d9533deabcaab0e7ed261a655a38cdf039826db0534e4936b
+	depends = glibc
+	source = air-1.27.4.tar.gz::https://github.com/cosmtrek/air/archive/v1.27.4.tar.gz
+	sha512sums = 512831511b472b5815a6980c4ea192939f820b0b860ee687ea4a4db2f264d485445c3a2ac442ed2f2448693610e5d789ca3715e5c7a5776c591038dd80800e0c
+	b2sums = 3aef8bb703b7ff746eff2ed4250275e6d5e90b6d33cfa75c96cdb1f56bc3106f8f974c9f4d9be7c971fd5740711a15813632fe09fe2a3618fc8bc67f91257723
 
 pkgname = air
-
diff --git a/PKGBUILD b/PKGBUILD
index e6285190750a..f541b637a0f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,46 @@
 # Maintainer: George Rawlinson <george@rawlinson.net.nz>
 
 pkgname=air
-pkgver=1.27.3
+pkgver=1.27.4
 pkgrel=1
 pkgdesc="Live reload for Go apps"
-arch=(x86_64)
-_url="github.com/cosmtrek/air"
-url="https://$_url"
-license=(GPL3)
-makedepends=(go)
+arch=('x86_64')
+url="https://github.com/cosmtrek/air"
+license=('GPL3')
+depends=('glibc')
+makedepends=('go')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha512sums=('545d58c612573378062e94fa1d8c51e7109e58c80209a568db9ff206660912b6de0d3c52ab4b348d9533deabcaab0e7ed261a655a38cdf039826db0534e4936b')
+sha512sums=('512831511b472b5815a6980c4ea192939f820b0b860ee687ea4a4db2f264d485445c3a2ac442ed2f2448693610e5d789ca3715e5c7a5776c591038dd80800e0c')
+b2sums=('3aef8bb703b7ff746eff2ed4250275e6d5e90b6d33cfa75c96cdb1f56bc3106f8f974c9f4d9be7c971fd5740711a15813632fe09fe2a3618fc8bc67f91257723')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  go mod vendor
+
+  # create directory for build output
+  mkdir build
+
+  # download dependencies
+  go mod download
 }
 
 build() {
   cd "$pkgname-$pkgver"
+
+  # set Go flags
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  local goVersion="$(go version | sed -r 's/go version go(.*)\ .*/\1/')"
+
   go build -v \
-    -buildmode=pie \
     -trimpath \
-    -mod=vendor \
+    -buildmode=pie \
+    -mod=readonly \
     -modcacherw \
-    -ldflags "-extldflags $LDFLAGS -X "main.Version=${pkgver}" -X "main.BuildTimestamp="$(date --iso-8601=seconds --utc)""" \
-    "$_url"
+    -ldflags "-linkmode external -extldflags ${LDFLAGS} \
+    -X main.airVersion=$pkgver \
+    -X main.goVersion=$goVersion" \
+    -o build .
 }
 
 check() {
@@ -34,10 +49,11 @@ check() {
 }
 
 package() {
+  cd "$pkgname-$pkgver"
+
   # binary
-  install -Dm755 -t "$pkgdir/usr/bin" "$pkgname-$pkgver/$pkgname"
+  install -vDm755 -t "$pkgdir/usr/bin"  "build/$pkgname"
 
   # documentation
-  install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" \
-    "$pkgname-$pkgver/"{README.md,air_example.toml}
+  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" README.md air_example.toml
 }