updpkg: jiri

Use system version of libgit2 instead of building it locally

2 files changed, 7 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b16205e6929..0be1166c0b67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Mar 22 07:28:05 UTC 2017
+# Wed May 17 06:08:10 UTC 2017
 pkgbase = jiri-git
 	pkgdesc = A tool for multi-repo development similar to Android repo
-	pkgver = r1172
+	pkgver = r1243
 	pkgrel = 1
 	url = https://fuchsia.googlesource.com/jiri
 	arch = i686
@@ -10,6 +10,7 @@ pkgbase = jiri-git
 	license = MIT
 	makedepends = git
 	makedepends = go
+	depends = libgit2
 	source = git+https://fuchsia.googlesource.com/jiri
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7885719f8317..3fcfdd8077d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=jiri-git
-pkgver=r1172
+pkgver=r1243
 pkgrel=1
 pkgdesc='A tool for multi-repo development similar to Android repo'
 arch=(i686 x86_64)
 url='https://fuchsia.googlesource.com/jiri'
 license=(MIT)
+depends=(libgit2)
 makedepends=(git go)
 source=(git+https://fuchsia.googlesource.com/jiri)
 sha1sums=('SKIP')
@@ -23,24 +24,12 @@ prepare() {
   mkdir -p .gopath/src/fuchsia.googlesource.com/
   ln -sf "$PWD" .gopath/src/fuchsia.googlesource.com/jiri
   export GOPATH="$PWD/.gopath"
+
+  go get -d github.com/libgit2/git2go
 }
 
 build() {
   cd jiri
-
-  go get -d github.com/libgit2/git2go
-  mkdir -p "${GOPATH}/src/github.com/libgit2/git2go/vendor/libgit2/build"
-  pushd "${GOPATH}/src/github.com/libgit2/git2go/vendor/libgit2/build"
-  cmake -GNinja \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_C_FLAGS=-fPIC \
-    -DTHREADSAFE=ON \
-    -DBUILD_CLAR=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
-    ..
-  ninja
-  popd
-
   go build -o build/jiri fuchsia.googlesource.com/jiri/cmd/jiri # -gccgoflags "$CFLAGS $LDFLAGS"
 }