summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody Schafer2020-01-23 10:43:34 -0500
committerCody Schafer2020-01-23 10:43:54 -0500
commit7a88ebe2096609988ec87b7da43250ca5a756aa7 (patch)
tree77f79e0b3b0a8aa6c88b027ef544d5b67ad7d677
parentfe526fd1bb59ee2e5e79b8cbeaccec61507ec885 (diff)
downloadaur-7a88ebe2096609988ec87b7da43250ca5a756aa7.tar.gz
update to 1.16
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD32
-rw-r--r--pahole.changelog14
4 files changed, 31 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf45cdcf9d0b..9dd818489a57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = pahole
pkgdesc = Various DWARF utils
- pkgver = 1.11
+ pkgver = 1.16
pkgrel = 1
url = http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary
- changelog = pahole.changelog
arch = i686
arch = x86_64
license = GPL2
@@ -12,9 +11,12 @@ pkgbase = pahole
depends = elfutils
depends = python
replaces = dwarves
- source = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.11.tar.gz
- md5sums = 33d2603497a599188b9d26ec3e416a98
- sha1sums = d1e0aace518342203c713b87024ebada848acd64
+ source = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.16.tar.gz
+ source = libbpf-0.0.6.tar.gz::https://github.com/libbpf/libbpf/archive/v0.0.6.tar.gz
+ md5sums = 4dcec51a18842cc471340d12ca78cab6
+ md5sums = 73c12c58350bc348907aef564ebd8d81
+ sha1sums = eae1b968f2d687c591e256acbd2fefd9aa60ee21
+ sha1sums = a8f6bca240c05aa5049bc8b3a20962ff3916c1e4
pkgname = pahole
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1a880f9d670f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+*.pkg.*
+/src/
+/pkg/
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
}
diff --git a/pahole.changelog b/pahole.changelog
deleted file mode 100644
index c9d5596b6459..000000000000
--- a/pahole.changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-2017-08-02 Pavel Borzenkov <pavel@voidptr.ru>
- * 1.11-1:
- updated to new upstream release
-
-2015-02-09 Pavel Borzenkov <pavel@voidptr.ru>
-
- * 1.10-2:
- fixed build in modern environment
-
-2013-12-26 Pavel Borzenkov <pavel@voidptr.ru>
-
- * 1.10-1:
- adopted package
- updated to new upstream release