update to 1.16

1 files changed, 20 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0a04b8d2f13a..7cd4815afa2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 # Maintainer: Pavel Borzenkov <pavel@voidptr.ru>
 
 pkgname=pahole
-pkgver=1.11
+pkgver=1.16
+_bpf_ver=0.0.6
 pkgrel=1
 pkgdesc="Various DWARF utils"
 arch=('i686' 'x86_64')
@@ -11,22 +12,29 @@ license=('GPL2')
 depends=('elfutils' 'python')
 makedepends=('git' 'cmake')
 replaces=('dwarves')
-source=("https://git.kernel.org/pub/scm/devel/${pkgname}/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.gz")
-changelog=${pkgname}.changelog
-md5sums=("33d2603497a599188b9d26ec3e416a98")
-sha1sums=("d1e0aace518342203c713b87024ebada848acd64")
+source=(
+  "https://git.kernel.org/pub/scm/devel/${pkgname}/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.gz"
+  "libbpf-$_bpf_ver.tar.gz::https://github.com/libbpf/libbpf/archive/v$_bpf_ver.tar.gz"
+)
+md5sums=('4dcec51a18842cc471340d12ca78cab6'
+         '73c12c58350bc348907aef564ebd8d81')
+sha1sums=('eae1b968f2d687c591e256acbd2fefd9aa60ee21'
+          'a8f6bca240c05aa5049bc8b3a20962ff3916c1e4')
 
-build()
-{
-  cd "${pkgname}-${pkgver}"
+prepare() {
+  mkdir -p build
+  rm -rf "${pkgname}-${pkgver}/lib/bpf/"*
+  cp -r "libbpf-$_bpf_ver/"* "${pkgname}-${pkgver}/lib/bpf"
+}
 
-  cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr -D__LIB=lib . || return 1
-  make || return 1
+build() {
+  cd build
+  cmake "../${pkgname}-${pkgver}" -DCMAKE_INSTALL_PREFIX:PATH=/usr -D__LIB=lib
+  make
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-
+  cd build
   make DESTDIR=${pkgdir}/ install
 }