From c8176cce186e8c28d0e2dc8f12b705e8c5b20bc3 Mon Sep 17 00:00:00 2001
From: xaizek <xaizek@posteo.net>
Date: Thu, 5 Jan 2023 23:10:35 +0000
Subject: [PATCH] development/pahole: Updated for version 1.24.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/pahole/pahole.SlackBuild | 15 +++++++++++----
 development/pahole/pahole.info       |  8 +++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/development/pahole/pahole.SlackBuild b/development/pahole/pahole.SlackBuild
index f001e805d3..1313776ccf 100644
--- a/development/pahole/pahole.SlackBuild
+++ b/development/pahole/pahole.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pahole
 
-# Copyright 2019 xaizek <xaizek@posteo.net>
+# Copyright 2019-2022 xaizek <xaizek@posteo.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pahole
-VERSION=${VERSION:-1.23}
+VERSION=${VERSION:-1.24}
+LIBBPF_VER="${LIBBPF_VER:-645500dd7d2d6b5bb76e4c0375d597d4f0c4814e}"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +71,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
+rm -rf libbpf-$LIBBPF_VER
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/libbpf-$LIBBPF_VER.tar.?z
+rmdir $PRGNAM-$VERSION/lib/bpf
+mv libbpf-$LIBBPF_VER $PRGNAM-$VERSION/lib/bpf
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,10 +84,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# -DDW_LANG_Haskell is a workaround for macro rename in /usr/include/dwarf.h
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DDW_LANG_Haskell=DW_LANG_Haskel" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -D__LIB="lib${LIBDIRSUFFIX}" \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -98,9 +104,10 @@ mv $PKG/usr/share/man $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# README.ctracer seems to be the only useful README
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING NEWS README README>DEBUG README.btf README.ctracer \
+  COPYING NEWS README.ctracer \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/pahole/pahole.info b/development/pahole/pahole.info
index 282c3a4150..c881652c19 100644
--- a/development/pahole/pahole.info
+++ b/development/pahole/pahole.info
@@ -1,8 +1,10 @@
 PRGNAM="pahole"
-VERSION="1.23"
+VERSION="1.24"
 HOMEPAGE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/"
-DOWNLOAD="https://ponce.cc/slackware/sources/repo/pahole-1.23.tar.xz"
-MD5SUM="b16a52e00ce97552bc7ca83499d5b08a"
+DOWNLOAD="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.24.tar.gz \
+          https://github.com/libbpf/libbpf/archive/645500dd7d2d6b5bb76e4c0375d597d4f0c4814e/libbpf-645500dd7d2d6b5bb76e4c0375d597d4f0c4814e.tar.gz"
+MD5SUM="62936bf33a027260e49dd29fb5628788 \
+        4f58901c11794c1e8d64747d39805a74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""