[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/

[Patrick McLean]

commit:     a9a195700d0c2766fe95ffafb44708882ea9e54e
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Nov 27 19:00:50 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 19:01:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a19570

dev-util/bpftrace-0.11.4: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-util/bpftrace/Manifest                         |  2 +-
 ...ace-0.11.3-r1.ebuild => bpftrace-0.11.4.ebuild} |  1 +
 .../files/bpftrace-0.11.4-old-kernels.patch        | 28 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 6aab218fe7e..786d756a582 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1 @@
-DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B 
950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e
 SHA512 
76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
+DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 
50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548
 SHA512 
611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82

diff --git a/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild 
b/dev-util/bpftrace/bpftrace-0.11.4.ebuild
similarity index 96%
rename from dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
rename to dev-util/bpftrace/bpftrace-0.11.4.ebuild
index b941fc56d71..a3a1fb79701 100644
--- a/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.4.ebuild
@@ -48,6 +48,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 PATCHES=(
        "${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
        "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+       "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
 )
 
 # lots of fixing needed

diff --git a/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch 
b/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch
new file mode 100644
index 00000000000..831de6487a8
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.11.4-old-kernels.patch
@@ -0,0 +1,28 @@
+diff --git a/src/btf.h b/src/btf.h
+index 61579a3..4e9f9fc 100644
+--- a/src/btf.h
++++ b/src/btf.h
+@@ -2,6 +2,7 @@
+ 
+ #include "types.h"
+ #include <linux/types.h>
++#include <linux/version.h>
+ #include <map>
+ #include <regex>
+ #include <string>
+@@ -11,6 +12,15 @@
+ struct btf;
+ struct btf_type;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
++/* this is required to build with 5.4 and earlier kernel headers */
++enum btf_func_linkage {
++    BTF_FUNC_STATIC = 0,
++    BTF_FUNC_GLOBAL = 1,
++    BTF_FUNC_EXTERN = 2,
++};
++#endif
++
+ namespace bpftrace {
+ 
+ class BTF