update to 1.6.0 (and fix a bunch of flags & build issues)

2 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8198b0a33c7f..4b8e4f9a426c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = grpcurl
 	pkgdesc = Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers
-	pkgver = 1.5.1
-	pkgrel = 2
+	pkgver = 1.6.0
+	pkgrel = 1
 	url = https://github.com/fullstorydev/grpcurl
 	arch = x86_64
 	license = MIT
 	makedepends = go
 	conflicts = grpcurl-bin
-	source = grpcurl-1.5.1.tar.gz::https://github.com/fullstorydev/grpcurl/archive/v1.5.1.tar.gz
-	md5sums = 2be962886db190fd11b5f4492ac979d9
+	source = grpcurl-1.6.0.tar.gz::https://github.com/fullstorydev/grpcurl/archive/v1.6.0.tar.gz
+	md5sums = 77082b483193d08ff6ff126269d1714d
 
 pkgname = grpcurl
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d99fc83b090..4a9a6b04a50d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,31 @@
 # Maintainer: Cody Schafer <dev@codyps.com>
 
 pkgname=grpcurl
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"
 arch=(x86_64)
 url="https://github.com/fullstorydev/grpcurl"
 license=('MIT')
 makedepends=('go')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/fullstorydev/grpcurl/archive/v$pkgver.tar.gz")
-md5sums=('2be962886db190fd11b5f4492ac979d9')
+md5sums=('77082b483193d08ff6ff126269d1714d')
 # really, `grpcurl-bin` should be conflicting with us instead of the oposite
 conflicts=('grpcurl-bin')
 
+
 build() {
 	cd "$pkgname-$pkgver"
-	go build \
-		-trimpath \
-		-mod=readonly \
-		-modcacherw \
-		-buildmode=pie \
-		-ldflags "-extldflags ${LDFLAGS}" \
-		-o build \
-		./cmd/grpcurl
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	go build -o build ./cmd/...
 }
 
 package() {
 	cd "$pkgname-$pkgver"
-	install -Dm755 grpcurl "${pkgdir}/usr/bin/grpcurl"
+	install -Dm755 build/grpcurl "${pkgdir}/usr/bin/grpcurl"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }