Fix linking and revision parsing

2 files changed, 10 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a75264005ec6..89e7e4885f0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = duf-git
 	pkgdesc = Disk Usage/Free Utility
-	pkgver = r107.4c15e83
+	pkgver = r128.bb93070
 	pkgrel = 1
 	url = https://github.com/muesli/duf
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 2f3d2ae47379..31907c992a83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,18 @@
 # Maintainer: Christian Muehlhaeuser <muesli at gmail dot com>
 
 pkgname=duf-git
-pkgver=r107.4c15e83
+pkgver=r128.bb93070
 pkgrel=1
 pkgdesc="Disk Usage/Free Utility"
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
-url="https://github.com/muesli/duf"
+url="https://github.com/muesli/${pkgname%-git}"
 license=('MIT')
 makedepends=('go' 'git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=($pkgname::git://github.com/muesli/duf.git)
+source=($pkgname::"git://github.com/muesli/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
-prepare() {
-    export GOPATH="$srcdir/gopath"
-    export GO111MODULE=on
-
-    go clean -modcache
-}
-
 pkgver() {
     cd "$srcdir/$pkgname"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -28,6 +21,11 @@ pkgver() {
 build() {
     cd "$srcdir/$pkgname"
 
+    local commit
+    local extraflags
+    commit=$(git rev-parse --short HEAD)
+    extraflags="-X main.Version=${pkgver} -X main.CommitSHA=${commit}"
+
     export CGO_CPPFLAGS="${CPPFLAGS}"
     export CGO_CFLAGS="${CFLAGS}"
     export CGO_CXXFLAGS="${CXXFLAGS}"
@@ -38,10 +36,8 @@ build() {
         -buildmode=pie \
         -mod=readonly \
         -modcacherw \
-        -ldflags "-X main.Version=$pkgver -linkmode external -extldflags \"${LDFLAGS}\"" \
+        -ldflags "${extraflags} -extldflags \"${LDFLAGS}\"" \
         -o "${pkgname%-git}" .
-
-    go clean -modcache
 }
 
 package() {