use ninja, fix version number, fix ostra python version

3 files changed, 53 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 896bb38bc5d2..ddf206a0e6a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pahole-git
 	pkgdesc = Various DWARF utils
-	pkgver = v1.10.r28.g9df42c6
+	pkgver = 1.12.r7.g70ef8c7
 	pkgrel = 1
 	url = http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary
 	arch = i686
@@ -8,13 +8,16 @@ pkgbase = pahole-git
 	license = GPL2
 	makedepends = git
 	makedepends = cmake
+	makedepends = ninja
 	depends = elfutils
-	depends = python
+	depends = python2
 	provides = dwarves
 	provides = pahole
 	conflicts = dwarves
 	conflicts = pahole
 	source = pahole-git::git+https://kernel.googlesource.com/pub/scm/devel/pahole/pahole.git
+	source = file://0001-ostra-use-python2.patch
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = pahole-git
diff --git a/0001-ostra-use-python2.patch b/0001-ostra-use-python2.patch
new file mode 100644
index 000000000000..e5c8d3a1d7ae
--- /dev/null
+++ b/0001-ostra-use-python2.patch
@@ -0,0 +1,22 @@
+From a97fc19cd1565a8ed711ce7dbcbd70f9e8c49d85 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Sun, 4 Nov 2018 23:33:24 -0500
+Subject: [PATCH] ostra: use python2
+
+---
+ ostra/ostra-cg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ostra/ostra-cg b/ostra/ostra-cg
+index 0f4009a..917da9f 100755
+--- a/ostra/ostra-cg
++++ b/ostra/ostra-cg
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+ # ostra-cg - generate callgraphs from encoded trace
+ #
+ # Arnaldo Carvalho de Melo <acme@redhat.com>
+-- 
+2.19.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 6d0547260e70..5d2163ba63ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,46 @@
 
 pkgname=pahole-git
 pkgdesc="Various DWARF utils"
-pkgver=v1.10.r28.g9df42c6
+pkgver=1.12.r7.g70ef8c7
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 license=('GPL2')
-source=($pkgname'::git+https://kernel.googlesource.com/pub/scm/devel/pahole/pahole.git')
-depends=('elfutils' 'python')
-makedepends=('git' 'cmake')
+depends=('elfutils' 'python2')
+makedepends=('git' 'cmake' 'ninja')
 provides=('dwarves' 'pahole')
 conflicts=('dwarves' 'pahole')
-md5sums=('SKIP')
+source=(
+  $pkgname'::git+https://kernel.googlesource.com/pub/scm/devel/pahole/pahole.git'
+  "file://0001-ostra-use-python2.patch"
+)
+md5sums=('SKIP' 'SKIP')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+  patch -Np1 -i "$srcdir/0001-ostra-use-python2.patch"  
+  mkdir -p build
+}
 
 pkgver() {
-  cd "$pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$srcdir/$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-  cd "$pkgname"
-  cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr -D__LIB=lib .
-  make
+  cd "$srcdir/$pkgname/build"
+
+  cmake -G Ninja \
+   -D CMAKE_BUILD_TYPE=Release \
+   -D CMAKE_INSTALL_PREFIX=/usr \
+   -D LIB_INSTALL_DIR=/usr/lib \
+   ..
+  ninja
 }
 
 package() {
-  cd "$pkgname"
-  make DESTDIR=${pkgdir}/ install
+  cd "$srcdir/$pkgname/build"
+  DESTDIR=${pkgdir}/ ninja install
 }
 
 # vim:set ts=2 sw=2 et: