[gentoo-commits] repo/gentoo:master commit in: dev-debug/bpftrace/, dev-debug/bpftrace/files/
commit: 80ffa6803e31930893c80678cf001aca9f7351f5
Author: Patrick McLean gentoo org>
AuthorDate: Tue Mar 26 17:23:49 2024 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Mar 26 18:18:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ffa680
dev-debug/bpftrace: drop 0.19.1, 0.20.0, 0.20.1
Signed-off-by: Patrick McLean gentoo.org>
dev-debug/bpftrace/Manifest| 2 -
dev-debug/bpftrace/bpftrace-0.19.1.ebuild | 95 --
dev-debug/bpftrace/bpftrace-0.20.0.ebuild | 94 --
dev-debug/bpftrace/bpftrace-0.20.1.ebuild | 94 --
.../files/bpftrace-0.19.0-install-libs.patch | 338 -
5 files changed, 623 deletions(-)
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index 05ac7d1f5a02..cb5f782335bf 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -1,4 +1,2 @@
-DIST bpftrace-0.19.1.gh.tar.gz 115 BLAKE2B
9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039
SHA512
2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
-DIST bpftrace-0.20.0.gh.tar.gz 1233420 BLAKE2B
f69a65f33a7c1bd518bccf06e7bb975086deef6b43304285f1ac9e6dc54d92c6d887b194f63f46351d5506a1d40eb3d8a70e79e3f3f00b4bbdd692789caee149
SHA512
4554ba3099af086c7a149b809f4855d913361153b5f0b9552dbfabd360300d4ef841fe743734950d10b93c497e062476766cd0f6569ba2ff01951a4cc3a6cdb8
DIST bpftrace-0.20.1.gh.tar.gz 1233431 BLAKE2B
fe9221a94d58b43e0311f8c841df8421c3fe226a3fe61f2ec5cce5de309acdb69a68834e92a2e622a1750975869cbdaa95a90f9afb83989aa61b56b551fa96e3
SHA512
fdcc2b0d091d4ab428207877626b0fb37f3e0778730e6a6db26be869a086264e1f24186857c47597813aacde98621a66301bcf6c8004f77bdf9ebf180f198ba0
DIST bpftrace-0.20.3.gh.tar.gz 1233923 BLAKE2B
c8a280441237d068029bd561a0fa70fd54676625c5bdd7d82a0a219d361cd71a460435ff05c865647d3e5c27d769ec296a47e5e7a3546fc8571af6a16d898300
SHA512
218a1bfac7e1a2b7eef5b0ed3e7403eed4bc932f2aa03c5f4c8924246c09088f5074ab3d54031e582cb4f8e7d0c7df1bb30007c2421c44d2c2506364f0ba5a0e
diff --git a/dev-debug/bpftrace/bpftrace-0.19.1.ebuild
b/dev-debug/bpftrace/bpftrace-0.19.1.ebuild
deleted file mode 100644
index 48f68c08a2ec..
--- a/dev-debug/bpftrace/bpftrace-0.19.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=17
-
-inherit llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace;
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# remove keywords until build works:
-# https://github.com/iovisor/bpftrace/issues/2349
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libbpf-1.1:=
- >=dev-util/bcc-0.25.0:=
- >=sys-devel/llvm-10[llvm_targets_BPF(+)]
- >=sys-devel/clang-10
- https://github.com/iovisor/bpftrace;
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# remove keywords until build works:
-# https://github.com/iovisor/bpftrace/issues/2349
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libbpf-1.1:=
- >=dev-util/bcc-0.25.0:=
- >=sys-devel/llvm-10[llvm_targets_BPF(+)]
- >=sys-devel/clang-10
- https://github.com/iovisor/bpftrace;
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# remove keywords until build works:
-# https://github.com/iovisor/bpftrace/issues/2349
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libbpf-1.1:=
- >=dev-util/bcc-0.25.0:=
- >=sys-devel/llvm-10[llvm_targets_BPF(+)]
- >=sys-devel/clang-10
- https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44)
-@@ -11,7 +12,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
- endif()
-
- add_executable(bpftrace-aotrt aot_main.cpp)
--target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs
cxxdemangler_stdlib)
-+target_link_libraries(bpftrace-aotrt aot bpftraceruntime bpftracearch
ast_defs cxxdemangler_stdlib)
- install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
-
- if(LIBPCAP_FOUND)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index e6a1d0a0..c53daa19 100644
a/src/arch/CMakeLists.txt
-+++
[gentoo-commits] repo/gentoo:master commit in: dev-debug/bpftrace/, dev-debug/bpftrace/files/
commit: 39340a3d3b3f93f9af613136e874f634305ee356
Author: Sam James gentoo org>
AuthorDate: Sat Mar 2 06:33:14 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 2 06:33:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39340a3d
dev-debug/bpftrace: fix USE=fuzzing build
Signed-off-by: Sam James gentoo.org>
dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild | 95 ++
.../bpftrace/files/bpftrace-0.20.1-fuzzer.patch| 42 ++
2 files changed, 137 insertions(+)
diff --git a/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild
b/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild
new file mode 100644
index ..d4856d58d474
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.20.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace;
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libbpf-1.1:=
+ >=dev-util/bcc-0.25.0:=
+ >=sys-devel/llvm-10[llvm_targets_BPF(+)]
+ >=sys-devel/clang-10
+ https://github.com/bpftrace/bpftrace/commit/fe6362b4e2c1b9d0833c7d3f308c1d4006b54723
+
+From fe6362b4e2c1b9d0833c7d3f308c1d4006b54723 Mon Sep 17 00:00:00 2001
+From: gkamathe <73747618+gkama...@users.noreply.github.com>
+Date: Fri, 16 Feb 2024 18:19:14 +0530
+Subject: [PATCH] =?UTF-8?q?fix=20bpftrace=5Ffuzz=20error=20for=20call=20to?=
+ =?UTF-8?q?=20'get=5Fkernel=E2=80=A6=5Fcflags'=20(#3007)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* fix bpftrace_fuzz error: no matching function for call to 'get_kernel_cflags'
+
+When compiling bpftace_fuzz we run into the following issue where 1
+argument is missing, adding the required argument
+
+src/fuzz_main.cpp:140:21: error: no matching function for call to
'get_kernel_cflags'
+ extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj);
+^
+src/utils.h:180:26: note: candidate function not viable: requires 4 arguments,
but 3 were provided
+std::vector get_kernel_cflags(const char *uname_machine,
+ ^
+Seems fourth argument was added via 4bcee640636e268de4b938a1007fb29a8836f049
+
+Signed-off-by: Gaurav Kamathe
+
+-
+
+Signed-off-by: Gaurav Kamathe
+--- a/src/fuzz_main.cpp
b/src/fuzz_main.cpp
+@@ -137,7 +137,8 @@ int fuzz_main(const char* data, size_t sz)
+ kobj = std::get<1>(kdirs);
+
+ if (ksrc != "")
+- extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj);
++ extra_flags = get_kernel_cflags(
++ utsname.machine, ksrc, kobj, bpftrace.kconfig);
+ }
+ extra_flags.push_back("-include");
+ extra_flags.push_back(CLANG_WORKAROUNDS_H);
+
[gentoo-commits] repo/gentoo:master commit in: dev-debug/bpftrace/, dev-debug/bpftrace/files/
commit: ea3f216953373087585e24acee96b80278d3d4fb
Author: Patrick McLean gentoo org>
AuthorDate: Tue Jan 23 20:51:37 2024 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Jan 23 20:51:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3f2169
dev-debug/bpftrace: add 0.20.0
Signed-off-by: Patrick McLean gentoo.org>
dev-debug/bpftrace/Manifest| 1 +
dev-debug/bpftrace/bpftrace-0.20.0.ebuild | 94 ++
.../files/bpftrace-0.20.0-install-libs.patch | 320 +
3 files changed, 415 insertions(+)
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index 83127dc3fafe..b16b9efa97c3 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -1 +1,2 @@
DIST bpftrace-0.19.1.gh.tar.gz 115 BLAKE2B
9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039
SHA512
2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
+DIST bpftrace-0.20.0.gh.tar.gz 1233420 BLAKE2B
f69a65f33a7c1bd518bccf06e7bb975086deef6b43304285f1ac9e6dc54d92c6d887b194f63f46351d5506a1d40eb3d8a70e79e3f3f00b4bbdd692789caee149
SHA512
4554ba3099af086c7a149b809f4855d913361153b5f0b9552dbfabd360300d4ef841fe743734950d10b93c497e062476766cd0f6569ba2ff01951a4cc3a6cdb8
diff --git a/dev-debug/bpftrace/bpftrace-0.20.0.ebuild
b/dev-debug/bpftrace/bpftrace-0.20.0.ebuild
new file mode 100644
index ..92cd7b068b6c
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.20.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace;
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libbpf-1.1:=
+ >=dev-util/bcc-0.25.0:=
+ >=sys-devel/llvm-10[llvm_targets_BPF(+)]
+ >=sys-devel/clang-10
+ https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44)
+@@ -11,7 +12,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
+ endif()
+
+ add_executable(bpftrace-aotrt aot_main.cpp)
+-target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs
cxxdemangler_stdlib)
++target_link_libraries(bpftrace-aotrt aot bpftraceruntime bpftracearch
ast_defs cxxdemangler_stdlib)
+ install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+ if(LIBPCAP_FOUND)
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index e6a1d0a0..c53daa19 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,19 +1,20 @@
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|aarch64)")
+-add_library(arch arm.cpp)
++add_library(bpftracearch arm.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
+CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+-add_library(arch ppc64.cpp)
++add_library(bpftracearch ppc64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
+CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
+-add_library(arch s390.cpp)
++add_library(bpftracearch s390.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-add_library(arch x86_64.cpp)
++add_library(bpftracearch x86_64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
+-add_library(arch mips64.cpp)
++add_library(bpftracearch mips64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
+-add_library(arch riscv64.cpp)
++add_library(bpftracearch riscv64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64")
+-add_library(arch loongarch64.cpp)
++add_library(bpftracearch loongarch64.cpp)
+ else()
+ message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+ endif()
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 65eab229..0bf35ec7 100644
+--- a/src/ast/CMakeLists.txt
b/src/ast/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_library(ast_defs ast.cpp)
+
+-add_library(ast
++add_library(bpftraceast
+ async_event_types.cpp
+ attachpoint_parser.cpp
+ dibuilderbpf.cpp
+@@ -23,11 +23,13 @@ add_library(ast
+ target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src)
+ target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
+ target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR})
+-target_link_libraries(ast ast_defs arch parser)
++target_link_libraries(bpftraceast ast_defs bpftracearch
