From e1cb5b802c13eea0ca702976a83afa75fac99aca Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 4 Dec 2020 16:38:14 -0600
Subject: [PATCH 1/2] pahole: update to 1.19.

---
 srcpkgs/pahole/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index d254993205a..55ab5b5a960 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,8 +1,8 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.18
+version=1.19
 revision=1
-_bpfver=0.1.1
+wrksrc="dwarves-${version}"
 build_style=cmake
 configure_args="-D__LIB=lib"
 makedepends="elfutils-devel zlib-devel"
@@ -10,20 +10,13 @@ short_desc="Various DWARF utils"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
-distfiles="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/v${_bpfver}.tar.gz"
-checksum="bb436a4b5e856c8963b1ea52260da064dc985f6e3832b29adec094422365a5a7
- 3fd271cf65b39bf38432b29d9dd2f694600c97dab0928baee419a65b5db4e598"
+distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
+checksum=9af54663f2bab10d1ea85f97801c8fa045ff62e9b39d4ec6a8541354cb7b6ef3
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"
 esac
 
-pre_patch() {
-	rm -rf lib/bpf
-	mv "../libbpf-${_bpfver}/" "lib/bpf"
-}
-
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
 		*-musl) sed -i CMakeLists.txt -e "/^target_link_libraries/s/)/ obstack argp)/"

From c56b72cc3875a417dc3669cc40a726698b2d3d63 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 4 Dec 2020 16:45:13 -0600
Subject: [PATCH 2/2] linux5.9: remove pahole aarch64 fix

---
 srcpkgs/linux5.9/template | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/srcpkgs/linux5.9/template b/srcpkgs/linux5.9/template
index 6904c69d4be..3b6d3bfddd5 100644
--- a/srcpkgs/linux5.9/template
+++ b/srcpkgs/linux5.9/template
@@ -73,12 +73,6 @@ do_configure() {
 		mips*) arch=mips;;
 	esac
 
-	case "$XBPS_TARGET_MACHINE" in
-		aarch64*) # XXX: fix segfault in pahole 1.18; should be fixed in new releases
-			vsed -i scripts/link-vmlinux.sh -e's;${PAHOLE} -J;& --btf_encode_force;'
-			;;
-	esac
-
 	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
 		msg_normal "Detected a custom .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config