From b108bb310476efd4aecb86dddf58f2a1b1d7f3d3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Jul 2019 17:44:00 -0500
Subject: [PATCH] pahole: update to 1.15.

---
 srcpkgs/pahole/patches/fix_always_inline.patch | 13 +++++++++++++
 srcpkgs/pahole/template                        | 14 +++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pahole/patches/fix_always_inline.patch b/srcpkgs/pahole/patches/fix_always_inline.patch
index 5e47f521122472..5c13fe9043813b 100644
--- a/srcpkgs/pahole/patches/fix_always_inline.patch
+++ b/srcpkgs/pahole/patches/fix_always_inline.patch
@@ -11,3 +11,16 @@
  #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y))
  
  static inline __attribute__((const)) bool is_power_of_2(unsigned long n)
+--- lib/bpf/src/libbpf.c.orig
++++ lib/bpf/src/libbpf.c
+@@ -10,6 +10,10 @@
+  * Copyright (C) 2019 Isovalent, Inc.
+  */
+
++#ifndef __always_inline
++#define __always_inline inline
++#endif
++
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index f8b412862ba6a2..f05bbd110f298b 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,7 +1,8 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.12
+version=1.15
 revision=1
+_bpfver=0.0.3
 build_style=cmake
 configure_args="-D__LIB=lib"
 makedepends="elfutils-devel zlib-devel"
@@ -9,13 +10,20 @@ 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"
-checksum=2452464cbfdbaece6187d7860000fe8ef24b7271f88122cf540d3e0ab4a644d1
+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="a84e183a0ef652e4198a161a20d9eeb45d3c153f5208e1cea833e1f28ae6207d
+ 972da73f4774be062a112fc0c9ebb5d238b775ed4512df5ce2cf20c8333929d3"
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack 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)/"