dev-util/bpftrace-0.10.0-r1: Fix build with bcc-0.15.0

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
Patrick McLean
2020-06-20 12:21:58 -07:00
parent 02572e7dd3
commit 9071888928
2 changed files with 15 additions and 0 deletions

View File

@@ -45,6 +45,8 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
"${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch"
# bpf_detach_kfunc has always been a noop
"${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.patch"
)
# lots of fixing needed

View File

@@ -0,0 +1,13 @@
diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
index c7e789e..08f657e 100644
--- a/src/attached_probe.cpp
+++ b/src/attached_probe.cpp
@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void)
int AttachedProbe::detach_kfunc(void)
{
close(tracing_fd_);
- return bpf_detach_kfunc(progfd_, NULL);
+ return 0;
}
#else
void AttachedProbe::attach_kfunc(void)