From aa541c900a947b869e8d9a2c12ad1ee056dcd1a5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 1 Sep 2021 18:39:59 -0500
Subject: [PATCH] pahole: update to 1.22.

---
 srcpkgs/pahole/patches/fix_limits.patch   | 24 -----------------------
 srcpkgs/pahole/patches/fix_sysconf.patch  | 16 ---------------
 srcpkgs/pahole/patches/fix_wordsize.patch | 12 ------------
 srcpkgs/pahole/template                   |  4 ++--
 4 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/pahole/patches/fix_limits.patch
 delete mode 100644 srcpkgs/pahole/patches/fix_sysconf.patch
 delete mode 100644 srcpkgs/pahole/patches/fix_wordsize.patch

diff --git a/srcpkgs/pahole/patches/fix_limits.patch b/srcpkgs/pahole/patches/fix_limits.patch
deleted file mode 100644
index 0ad585ee193..00000000000
--- a/srcpkgs/pahole/patches/fix_limits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git dwarves.c dwarves.c
-index 8cb359f..98b8b6b 100644
---- a/dwarves.c
-+++ b/dwarves.c
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-+#include <limits.h>
- 
- #include "config.h"
- #include "list.h"
-diff --git pahole.c pahole.c
-index dac7a49..15c0c29 100644
---- a/pahole.c
-+++ b/pahole.c
-@@ -10,6 +10,7 @@
- #include <assert.h>
- #include <stdio.h>
- #include <dwarf.h>
-+#include <limits.h>
- #include <inttypes.h>
- #include <search.h>
- #include <stdarg.h>
diff --git a/srcpkgs/pahole/patches/fix_sysconf.patch b/srcpkgs/pahole/patches/fix_sysconf.patch
deleted file mode 100644
index bb07948c392..00000000000
--- a/srcpkgs/pahole/patches/fix_sysconf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/dwarves_fprintf.c
-+++ b/dwarves_fprintf.c
-@@ -1683,11 +1683,13 @@
- void dwarves__fprintf_init(uint16_t user_cacheline_size)
- {
- 	if (user_cacheline_size == 0) {
-+#ifdef _SC_LEVEL1_DCACHE_LINESIZE
- 		long sys_cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
- 
- 		if (sys_cacheline_size > 0)
- 			cacheline_size = sys_cacheline_size;
- 		else
-+#endif
- 			cacheline_size = 64; /* Fall back to a sane value */
- 	} else
- 		cacheline_size = user_cacheline_size;
diff --git a/srcpkgs/pahole/patches/fix_wordsize.patch b/srcpkgs/pahole/patches/fix_wordsize.patch
deleted file mode 100644
index a052883d869..00000000000
--- a/srcpkgs/pahole/patches/fix_wordsize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/hash.h
-+++ b/hash.h
-@@ -16,6 +16,9 @@
- 
- #include <stdint.h>
- 
-+#undef __WORDSIZE
-+#define __WORDSIZE 64
-+
- /* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */
- #define GOLDEN_RATIO_PRIME_32 0x9e370001UL
- /*  2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */
diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index d3b720d72f2..6eb25b847f4 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,6 +1,6 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.21
+version=1.22
 revision=1
 wrksrc="dwarves-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ 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://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=33a8bed6c0e1a5889578e01d1afed3f752353dc087d8bda36d258fe83e42a476
+checksum=8bcba48be39da2868142440dc2ee7f1d7b99ffec8095e3a1afb280dc1a7c63df
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"