Update versioning scheme

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3fae62f7779..4d7cf0f30fcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gllvm-git
 	pkgdesc = Whole Program LLVM: wllvm ported to go
-	pkgver = v1.2.9.r3.g78dee16
+	pkgver = 1.2.9.r3.g78dee16
 	pkgrel = 1
 	url = https://github.com/SRI-CSL/gllvm
 	arch = any
@@ -11,7 +11,7 @@ pkgbase = gllvm-git
 	depends = llvm
 	provides = gllvm
 	conflicts = gllvm
-	source = gllvm-git::git+https://github.com/SRI-CSL/gllvm.git
+	source = gllvm-git::git+https://github.com/SRI-CSL/gllvm
 	sha256sums = SKIP
 
 pkgname = gllvm-git
diff --git a/PKGBUILD b/PKGBUILD
index 1434ee10c20a..c729eef45bcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kuan-Yen Chou <kuanyenchou at gmail dot com>
 
 pkgname=gllvm-git
-pkgver=v1.2.9.r3.g78dee16
+pkgver=1.2.9.r3.g78dee16
 pkgrel=1
 pkgdesc="Whole Program LLVM: wllvm ported to go"
 arch=('any')
@@ -11,12 +11,16 @@ depends=('clang' 'llvm')
 makedepends=('git' 'go')
 provides=('gllvm')
 conflicts=('gllvm')
-source=("$pkgname"::'git+https://github.com/SRI-CSL/gllvm.git')
+source=("$pkgname"::'git+https://github.com/SRI-CSL/gllvm')
 sha256sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/$pkgname"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    if git describe --long --tags >/dev/null 2>&1; then
+        git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    else
+        printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git describe --always)"
+    fi
 }
 
 package() {