From 05d004dfe0c9a9d898fac8a4a0292ca2a74ca391 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Mon, 19 Dec 2022 23:07:05 +0000
Subject: Making things work

---
 repo/pahole/pahole.xibuild | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'repo/pahole/pahole.xibuild')

diff --git a/repo/pahole/pahole.xibuild b/repo/pahole/pahole.xibuild
index 821c4f5..46586dc 100644
--- a/repo/pahole/pahole.xibuild
+++ b/repo/pahole/pahole.xibuild
@@ -1,22 +1,34 @@
 #!/bin/sh
 
-MAKEDEPS="cmake-modules python make "
-DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone"
+NAME="pahole"
+DESC="dwarf manipulation utilities"
 
-PKG_VER=1.22
-SOURCE=https://git.kernel.org/pub/scm/devel/pahole/pahole.git
-BRANCH=v$PKG_VER
+MAKEDEPS=" cmake elfutils libdwarf zlib libbpf linux-headers musl-obstack argp-standalone samurai"
 
-DESC="Pahole and other DWARF Utils"
+PKG_VER=1.24
+SOURCE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-v$PKG_VER.tar.gz"
 
-build () {
-    cmake -B build -G Ninja .  \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=None \
-        -D__LIB=lib 
-    cmake --build build
+ADDITIONAL="
+0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch
+"
+
+prepare () {
+    apply_patches
 }
 
-package () {
-    DESTDIR="$PKG_DEST" cmake --install build
+build() {
+	export CFLAGS="$CFLAGS -I/usr/include/bpf/uapi"
+
+	cmake -B build -G Ninja . \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-D__LIB=lib \
+		-DCMAKE_MODULE_PATH=/usr/lib/cmake \
+		-DLIBBPF_EMBEDDED=OFF
+	cmake --build build
 }
+
+package() {
+	DESTDIR="$PKG_DEST" cmake --build build --target install
+}
+
-- 
cgit v1.2.1