From 29fc811ab03cc5ece12ea8a54d70281d38fc6a4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 22 Sep 2021 13:12:53 +0200
Subject: [PATCH] bcc: update to 0.22.0.

---
 srcpkgs/bcc/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd025972..bb6561f4e66 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.22.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
@@ -12,12 +12,8 @@ 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"
-# 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"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
+checksum=9d195db7fe617cdde03e2af7cfd1ac07751aaf0e7e966aaa19237db8fe91fd40
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ 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"