From 784292f9e6ea847ee99b8034938ab4643d246a32 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 23:20:05 +0200
Subject: [PATCH] bcc: use an updated libbpf to fix build on 32-bit systems

---
 srcpkgs/bcc/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5a3e66c86c..c2b7a65c19 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=2
+revision=3
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"