[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: 4d5166d36b88075ad2f7442caff4733922f9ff58
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Dec 26 09:45:42 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Dec 28 01:03:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5166d3
dev-util/bpftrace: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34484
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/bpftrace-0.18.0-install-libs.patch | 329 -
.../files/bpftrace-0.18.1-install-libs.patch | 329 -
2 files changed, 658 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.18.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.18.0-install-libs.patch
deleted file mode 100644
index 17a07bc6ea02..
--- a/dev-util/bpftrace/files/bpftrace-0.18.0-install-libs.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c573207..ab376c3e 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,9 +135,10 @@ endif()
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
COMPILE_FLAGS ${BISON_FLAGS} VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a1..f5c4d676 100644
a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
-
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- function(embed_headers output)
- file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 708c8bf3..7be92f63 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -13,7 +13,7 @@ else()
- endif ()
- endif()
-
--add_library(runtime
-+add_library(bpftraceruntime
- attached_probe.cpp
- bpffeature.cpp
- bpftrace.cpp
-@@ -44,7 +44,7 @@ add_library(runtime
- ${BFD_DISASM_SRC}
- )
- # Ensure flex+bison outputs are built first
--add_dependencies(runtime parser)
-+add_dependencies(bpftraceruntime bpftraceparser)
-
- add_library(libbpftrace
- build_info.cpp
-@@ -61,6 +61,7 @@ add_executable(${BPFTRACE}
- )
-
- install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- target_link_libraries(${BPFTRACE} libbpftrace)
-
- if (BUILD_FUZZ)
-@@ -89,7 +90,7 @@ endif()
- set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
- if (KERNEL_HEADERS_DIR)
- MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}")
-- target_compile_definitions(runtime PUBLIC
KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
-+ target_compile_definitions(bpftraceruntime PUBLIC
KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
- endif()
-
- execute_process(
-@@ -109,10 +110,11 @@ endif()
-
- add_definitions("-DBPFTRACE_VERSION=\"${BPFTRACE_VERSION}\"")
-
--target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR})
--target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast)
--target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS})
-+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_BINARY_DIR})
-+target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceruntime PRIVATE
${CMAKE_SOURCE_DIR}/src/ast)
-+target_compile_definitions(bpftraceruntime PRIVATE ${BPFTRACE_FLAGS})
-+install(TARGETS bpftraceruntime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS})
-
- # Linking
-@@ -125,8 +127,8 @@ if(STATIC_LINKING)
- endif(STATIC_LINKING)
-
-
--target_link_libraries(runtime ${LIBBPF_LIBRARIES})
--target_link_libraries(libbpftrace parser resources runtime aot ast arch
cxxdemangler_llvm)
-+target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES})
-+target_link_libraries(libbpftrace bpftraceparser bpftraceresources
bpftraceruntime aot bpftraceast bpftra
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 27c80ba31e6f161964186a09581c2d76b1a8d45d
Author: Jakov Smolić gentoo org>
AuthorDate: Sat Dec 23 18:37:51 2023 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat Dec 23 18:45:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c80ba3
dev-util/bpftrace: drop 0.18.0, 0.18.1, 0.19.0
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/Manifest | 3 -
dev-util/bpftrace/bpftrace-0.18.0.ebuild | 95
dev-util/bpftrace/bpftrace-0.18.1.ebuild | 95
dev-util/bpftrace/bpftrace-0.19.0.ebuild | 95
4 files changed, 288 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 96650514fca6..83127dc3fafe 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1 @@
-DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
-DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B
67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec
SHA512
eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a
-DIST bpftrace-0.19.0.gh.tar.gz 1157739 BLAKE2B
ebedebe365621436da7735e373dcb142ddad9c8869b8d1c20b227b8cf772b1005d79cec7eef16f7ef7b9f92b9061751986efe43bd102c7592051a549377161bf
SHA512
727e1319e8bcb9b197636c2bd3145c1805e0772e268187a1c71979966f28c81e92347606be383f71f922f56df62afea8ac672d5d40fd0338b3687e0520fa3786
DIST bpftrace-0.19.1.gh.tar.gz 115 BLAKE2B
9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039
SHA512
2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
diff --git a/dev-util/bpftrace/bpftrace-0.18.0.ebuild
b/dev-util/bpftrace/bpftrace-0.18.0.ebuild
deleted file mode 100644
index b71d49f48399..
--- a/dev-util/bpftrace/bpftrace-0.18.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 410c9a90f576e32340e775b88b820b66efce8f28
Author: Patrick McLean gentoo org>
AuthorDate: Wed Oct 4 16:49:44 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Oct 4 17:42:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410c9a90
dev-util/bpftrace: add 0.19.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.19.1.ebuild | 95
2 files changed, 96 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 52e5415f547e..96650514fca6 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,4 @@
DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B
67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec
SHA512
eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a
DIST bpftrace-0.19.0.gh.tar.gz 1157739 BLAKE2B
ebedebe365621436da7735e373dcb142ddad9c8869b8d1c20b227b8cf772b1005d79cec7eef16f7ef7b9f92b9061751986efe43bd102c7592051a549377161bf
SHA512
727e1319e8bcb9b197636c2bd3145c1805e0772e268187a1c71979966f28c81e92347606be383f71f922f56df62afea8ac672d5d40fd0338b3687e0520fa3786
+DIST bpftrace-0.19.1.gh.tar.gz 115 BLAKE2B
9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039
SHA512
2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
diff --git a/dev-util/bpftrace/bpftrace-0.19.1.ebuild
b/dev-util/bpftrace/bpftrace-0.19.1.ebuild
new file mode 100644
index ..8867a4b1b3ae
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.19.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 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
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: c3a27f1d619823900583b34c9e5fe304a0efb2e4
Author: Patrick McLean gentoo org>
AuthorDate: Tue Sep 19 18:31:41 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Sep 19 18:32:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a27f1d
dev-util/bpftrace: drop 0.17.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.17.1.ebuild | 97 --
.../files/bpftrace-0.17.0-install-libs.patch | 329 -
.../bpftrace/files/bpftrace-0.17.0-llvm-16.patch | 26 --
.../files/bpftrace-0.17.0-use-std-optional.patch | 44 ---
5 files changed, 497 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 198bdcf06805..52e5415f547e 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1,3 @@
-DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B
5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce
SHA512
57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B
67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec
SHA512
eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a
DIST bpftrace-0.19.0.gh.tar.gz 1157739 BLAKE2B
ebedebe365621436da7735e373dcb142ddad9c8869b8d1c20b227b8cf772b1005d79cec7eef16f7ef7b9f92b9061751986efe43bd102c7592051a549377161bf
SHA512
727e1319e8bcb9b197636c2bd3145c1805e0772e268187a1c71979966f28c81e92347606be383f71f922f56df62afea8ac672d5d40fd0338b3687e0520fa3786
diff --git a/dev-util/bpftrace/bpftrace-0.17.1.ebuild
b/dev-util/bpftrace/bpftrace-0.17.1.ebuild
deleted file mode 100644
index 21b7e21bf0fd..
--- a/dev-util/bpftrace/bpftrace-0.17.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-
-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 d01d1ea3..82bfeccc 100644
a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,21 +1,23 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--add_library(arch aarch64.cpp)
-+add_library(bpftracearch aarch64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
--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(bpftra
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 0c899ec1569406739620796f881977b7b60d2b25
Author: Patrick McLean gentoo org>
AuthorDate: Tue Sep 19 18:29:50 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Sep 19 18:32:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c899ec1
dev-util/bpftrace: add 0.19.0
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.19.0.ebuild | 95 ++
.../files/bpftrace-0.19.0-install-libs.patch | 338 +
3 files changed, 434 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 6d71c4df156e..198bdcf06805 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,4 @@
DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B
5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce
SHA512
57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B
67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec
SHA512
eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a
+DIST bpftrace-0.19.0.gh.tar.gz 1157739 BLAKE2B
ebedebe365621436da7735e373dcb142ddad9c8869b8d1c20b227b8cf772b1005d79cec7eef16f7ef7b9f92b9061751986efe43bd102c7592051a549377161bf
SHA512
727e1319e8bcb9b197636c2bd3145c1805e0772e268187a1c71979966f28c81e92347606be383f71f922f56df62afea8ac672d5d40fd0338b3687e0520fa3786
diff --git a/dev-util/bpftrace/bpftrace-0.19.0.ebuild
b/dev-util/bpftrace/bpftrace-0.19.0.ebuild
new file mode 100644
index ..4fa38e3d617a
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.19.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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/CMakeLis
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 53e4f55f26d3ae4c93ac3308c56e7d8d44908a01
Author: Patrick McLean gentoo org>
AuthorDate: Thu Aug 31 18:35:00 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Aug 31 18:35:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e4f55f
dev-util/bpftrace: add 0.18.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.18.1.ebuild | 95 ++
.../files/bpftrace-0.18.1-install-libs.patch | 329 +
3 files changed, 425 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 132e185ee5e1..6d71c4df156e 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B
5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce
SHA512
57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
+DIST bpftrace-0.18.1.gh.tar.gz 1046307 BLAKE2B
67c5d586e803c16ae0338563953e86cb3fbf318410f5757824a56fdf049b4b4fe5cc2d2b7e0435c625728b0b25123bcc8d64eaa923c14334d9ec23075c8deeec
SHA512
eb81554f4707f8c919930932ff6ec7602578c317c058238a16fe38d6db055da0d7b355733821203281767419aa8e1b2256bb7a921f50c987c85395ecfbda966a
diff --git a/dev-util/bpftrace/bpftrace-0.18.1.ebuild
b/dev-util/bpftrace/bpftrace-0.18.1.ebuild
new file mode 100644
index ..46d001890f50
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.18.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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 d01d1ea3..82bfeccc 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,21 +1,23 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-add_library(arch aarch64.cpp)
++add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
+-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 c390ea6a..37019bd9 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(bpf
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: bc6c68c71d8ac4ff9a4f21397b3a85b94acdfda0
Author: Patrick McLean gentoo org>
AuthorDate: Mon May 15 19:05:16 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon May 15 19:34:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6c68c7
dev-util/bpftrace: drop 0.16.0-r1, 0.16.0-r2, 0.17.0-r3, 0.17.0-r4
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild| 92 -
dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild| 93 -
dev-util/bpftrace/bpftrace-0.17.0-r3.ebuild| 97 -
dev-util/bpftrace/bpftrace-0.17.0-r4.ebuild| 97 -
.../files/bpftrace-0.16.0-install-libs.patch | 210 --
.../files/bpftrace-0.16.0-opaquepointer.patch | 450 -
6 files changed, 1039 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
deleted file mode 100644
index 3f624490bfe6..
--- a/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-
-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.0:=
- >=dev-util/bcc-0.25.0:=
- 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.0:=
- >=dev-util/bcc-0.25.0:=
- 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 runtime 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 127c3528..4e05d40a 100644
a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,17 +1,19 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--add_library(arch aarch64.cpp)
-+add_library(bpftracearch aarch64.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)
- else()
- message(FATAL_ERROR "Un
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 3ff866987e32681f18e027f581eaa70c03038101
Author: Patrick McLean gentoo org>
AuthorDate: Mon May 15 19:05:00 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon May 15 19:34:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff86698
dev-util/bpftrace: add 0.18.0
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 3 +-
dev-util/bpftrace/bpftrace-0.18.0.ebuild | 95 ++
.../files/bpftrace-0.18.0-install-libs.patch | 329 +
3 files changed, 425 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 869576973dc0..132e185ee5e1 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
-DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B
20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e
SHA512
52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
-DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B
960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e
SHA512
b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3
DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B
5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce
SHA512
57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
+DIST bpftrace-0.18.0.gh.tar.gz 1046210 BLAKE2B
921fdd56cff48e7b8fc2b8164839393f2759218accaa58412fdf80b2df4474067c3c660da09e3ee808d258c1f19b0534fa81462cbea5ce3e814bdbeaa7dce5aa
SHA512
b7da273d251f03a81b3a7097407352e7ad1d023972852bdb883176e97bab7046f9f327bd03bca51fe853ecaab5f60adc6994e75cb450a033a5b91118f719c36d
diff --git a/dev-util/bpftrace/bpftrace-0.18.0.ebuild
b/dev-util/bpftrace/bpftrace-0.18.0.ebuild
new file mode 100644
index ..b71d49f48399
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.18.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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 d01d1ea3..82bfeccc 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,21 +1,23 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-add_library(arch aarch64.cpp)
++add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
+-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}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: afcc513ccbc177e1b8d253ac2c79c2ecde67ac83
Author: Patrick McLean gentoo org>
AuthorDate: Thu Apr 20 21:09:30 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 20 21:09:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcc513c
dev-util/bpftrace: add 0.17.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.17.1.ebuild | 97
2 files changed, 98 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index d51f5f17e321..869576973dc0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B
20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e
SHA512
52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B
960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e
SHA512
b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3
+DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B
5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce
SHA512
57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
diff --git a/dev-util/bpftrace/bpftrace-0.17.1.ebuild
b/dev-util/bpftrace/bpftrace-0.17.1.ebuild
new file mode 100644
index ..21b7e21bf0fd
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.17.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: d2993133f11e0b2aaad9d74a15a337ef27a8538d
Author: Patrick McLean gentoo org>
AuthorDate: Wed Apr 12 23:31:02 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Apr 12 23:31:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2993133
dev-util/bpftrace: Fix invalid LLVM dep (bug #902161)
Closes: https://bugs.gentoo.org/902161
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.17.0-r4.ebuild | 97 +
1 file changed, 97 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r4.ebuild
b/dev-util/bpftrace/bpftrace-0.17.0-r4.ebuild
new file mode 100644
index ..21b7e21bf0fd
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.17.0-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 25470c4c3bcdad4ae67fbe3a65b21682fe0fe670
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Sun Mar 19 12:40:51 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Mar 19 17:34:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25470c4c
dev-util/bpftrace: fixes for llvm-16
Closes: https://bugs.gentoo.org/902135
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/30234
Signed-off-by: Michał Górny gentoo.org>
...-0.17.0-r2.ebuild => bpftrace-0.17.0-r3.ebuild} | 2 +
.../bpftrace/files/bpftrace-0.17.0-llvm-16.patch | 26 +
.../files/bpftrace-0.17.0-use-std-optional.patch | 44 ++
3 files changed, 72 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
b/dev-util/bpftrace/bpftrace-0.17.0-r3.ebuild
similarity index 94%
rename from dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
rename to dev-util/bpftrace/bpftrace-0.17.0-r3.ebuild
index f976f34e8416..161c441420f7 100644
--- a/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.17.0-r3.ebuild
@@ -55,6 +55,8 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.17.0-install-libs.patch"
"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.17.0-llvm-16.patch"
+ "${FILESDIR}/bpftrace-0.17.0-use-std-optional.patch"
)
pkg_pretend() {
diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch
b/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch
new file mode 100644
index ..5d845c134bea
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.17.0-llvm-16.patch
@@ -0,0 +1,26 @@
+
+From: https://github.com/iovisor/bpftrace/pull/2528
+
+From a91064d7fb26626d79719c2e2a13cc2acab9549a Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Fri, 10 Mar 2023 00:08:27 -0800
+Subject: [PATCH] cmake: Raise max llvm major version to 16
+
+Signed-off-by: Khem Raj
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0a7914f580d..341ac7e9c1f 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -165,7 +165,7 @@ else()
+ endif()
+
+ set(MIN_LLVM_MAJOR 6)
+- set(MAX_LLVM_MAJOR 15)
++ set(MAX_LLVM_MAJOR 16)
+
+ if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR
(${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR}))
+ message(SEND_ERROR "Unsupported LLVM version found via
${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}")
diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch
b/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch
new file mode 100644
index ..21b4b7e6c267
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.17.0-use-std-optional.patch
@@ -0,0 +1,44 @@
+
+From: https://github.com/iovisor/bpftrace/pull/2525
+
+From a794397394aa836f776da17c8e08876a2f64d477 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Mon, 13 Mar 2023 21:30:27 -0700
+Subject: [PATCH] ast: Use std::optional in CodegenLLVM::CodegenLLVM call
+
+Fixes build with clang-16
+
+src/ast/passes/codegen_llvm.cpp:63:53: error: use of undeclared identifier
'Optional'; did you mean 'std::optional'?
+
+Signed-off-by: Khem Raj
+---
+ src/ast/passes/codegen_llvm.cpp | 16 +++-
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp
+index 616ff89ddbc..fe440adf373 100644
+--- a/src/ast/passes/codegen_llvm.cpp
b/src/ast/passes/codegen_llvm.cpp
+@@ -56,11 +56,17 @@ CodegenLLVM::CodegenLLVM(Node *root, BPFtrace &bpftrace)
+ throw std::runtime_error(
+ "Could not find bpf llvm target, does your llvm support it?");
+
+- target_machine_.reset(target->createTargetMachine(LLVMTargetTriple,
+-"generic",
+-"",
+-TargetOptions(),
+-
Optional()));
++ target_machine_.reset(
++ target->createTargetMachine(LLVMTargetTriple,
++ "generic",
++ "",
++ TargetOptions(),
++#if LLVM_VERSION_MAJOR >= 16
++ std::optional()
++#else
++ Optional()
++#endif
++ ));
+ target_machine_->setOptLevel(llvm::CodeGenOpt::Aggressive);
+
+ module_->setTargetTriple(LLVMTargetTriple);
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: df9d6c8ee2036f04607f68ba6a50c0c134b5671a
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Feb 8 16:52:01 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Feb 8 18:34:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9d6c8e
dev-util/bpftrace: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29486
Signed-off-by: Patrick McLean gentoo.org>
.../files/bpftrace-0.15.0-llvm-15-pointers.patch | 30 --
1 file changed, 30 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
deleted file mode 100644
index 51ea034b9a88..
--- a/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-From: https://github.com/iovisor/bpftrace/pull/2367
-Bug: https://bugs.gentoo.org/872842
-
-From 07fa48a94ef6d6bb1f335de345de18fe9776ca57 Mon Sep 17 00:00:00 2001
-From: kenneth topp
-Date: Mon, 26 Sep 2022 00:33:29 -0400
-Subject: [PATCH] Workaround OpaquePointers for LLVM 15
-
-This workaround allows bpftrace to be compiled against
-LLVM-15. This will have to be address properly before LLVM-16
-More details from LLVM here: https://llvm.org/docs/OpaquePointers.html
- src/ast/irbuilderbpf.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index d49883f786..00f0f172ff 100644
a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -123,6 +123,9 @@ IRBuilderBPF::IRBuilderBPF(LLVMContext &context,
- module_(module),
- bpftrace_(bpftrace)
- {
-+#if LLVM_VERSION_MAJOR == 15
-+ context.setOpaquePointers(false);
-+#endif
- // Declare external LLVM function
- FunctionType *pseudo_func_type = FunctionType::get(
- getInt64Ty(),
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: c769d53008070e3795d5999bc5732f2d966e01c7
Author: Patrick McLean gentoo org>
AuthorDate: Mon Feb 6 02:03:48 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Feb 6 02:03:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c769d530
dev-util/bpftrace: revbump to 0.17.0-r2 Install bpstracearch (bug #893122)
Closes: https://bugs.gentoo.org/893122
Signed-off-by: Patrick McLean gentoo.org>
.../{bpftrace-0.17.0-r1.ebuild => bpftrace-0.17.0-r2.ebuild}| 0
dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch | 6 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
rename to dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
index a884acc7ef28..7c14f8f9416e 100644
--- a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
@@ -213,10 +213,10 @@ index c776d204..41e84317 100644
if(LIBPCAP_FOUND)
diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index d01d1ea3..7d96587f 100644
+index d01d1ea3..82bfeccc 100644
--- a/src/arch/CMakeLists.txt
+++ b/src/arch/CMakeLists.txt
-@@ -1,21 +1,21 @@
+@@ -1,21 +1,23 @@
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-add_library(arch aarch64.cpp)
+add_library(bpftracearch aarch64.cpp)
@@ -246,6 +246,8 @@ index d01d1ea3..7d96587f 100644
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 c390ea6a..37019bd9 100644
--- a/src/ast/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 73f11ee67c4e0e7bc968f968fa2befd2176446b1
Author: Patrick McLean gentoo org>
AuthorDate: Wed Feb 1 01:56:53 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Feb 1 01:57:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f11ee6
dev-util/bpftrace: Update libbpf dep to 1.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/{bpftrace-0.17.0.ebuild => bpftrace-0.17.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.17.0.ebuild
b/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
similarity index 98%
rename from dev-util/bpftrace/bpftrace-0.17.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
index e2084dacecf4..f976f34e8416 100644
--- a/dev-util/bpftrace/bpftrace-0.17.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="fuzzing test"
RESTRICT="test"
RDEPEND="
- >=dev-libs/libbpf-1.0:=
+ >=dev-libs/libbpf-1.1:=
>=dev-util/bcc-0.25.0:=
>=sys-devel/llvm-10:=[llvm_targets_BPF(+)]
>=sys-devel/clang-10:=
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: afe066b68f5ccdf61bba479d22669b66b40fb257
Author: Patrick McLean gentoo org>
AuthorDate: Mon Jan 30 21:52:48 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Jan 30 21:54:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe066b6
dev-util/bpftrace: Restore deleted patch that is still used
Signed-off-by: Patrick McLean gentoo.org>
.../files/bpftrace-0.15.0-dont-compress-man.patch | 47 ++
1 file changed, 47 insertions(+)
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch
new file mode 100644
index ..84241e052462
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch
@@ -0,0 +1,47 @@
+diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt
+index 1a81dee0..c93ccbd2 100644
+--- a/man/adoc/CMakeLists.txt
b/man/adoc/CMakeLists.txt
+@@ -1,7 +1,5 @@
+-find_program(GZIP gzip REQUIRED)
+ find_program(ASCIIDOCTOR asciidoctor)
+ file(GLOB FILES *.adoc)
+-set(GZFILES "")
+ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+ foreach(FIL ${FILES})
+ get_filename_component(NAME ${FIL} NAME_WE)
+@@ -12,14 +10,9 @@ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+ COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE}
+ DEPENDS ${FIL})
+
+-add_custom_command(OUTPUT ${GZ_MANPAGE_FILE}
+- COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE}
+- DEPENDS ${MANPAGE_FILE})
+-
+-list(APPEND GZFILES ${GZ_MANPAGE_FILE})
+ endforeach()
+- add_custom_target(adoc_man DEPENDS ${GZFILES})
+- install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++ add_custom_target(adoc_man DEPENDS ${FILES})
++ install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ else()
+ message(WARNING "asciidoctor not found, building without bpftrace manpage")
+ add_custom_target(adoc_man)
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index 2a316cd9..2207cf80 100644
+--- a/man/man8/CMakeLists.txt
b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip REQUIRED)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+- get_filename_component(NAME ${FIL} NAME)
+- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-DEPENDS ${FIL})
+- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
+-endforeach()
+ add_custom_target(man_man DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 8a1f60be59370d648a6216df8586c7f316f7f21d
Author: Patrick McLean gentoo org>
AuthorDate: Mon Jan 30 19:08:30 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Jan 30 19:10:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1f60be
dev-util/bpftrace: drop 0.15.0-r2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild| 95 --
.../bpftrace/files/bpftrace-0.15.0-bcc-025.patch | 88 -
.../files/bpftrace-0.15.0-binutils-2.39.patch | 87 -
.../files/bpftrace-0.15.0-dont-compress-man.patch | 47 -
.../files/bpftrace-0.15.0-install-libs.patch | 199 -
5 files changed, 516 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
deleted file mode 100644
index f0998d9f30ca..
--- a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=15
-
-inherit llvm linux-info cmake toolchain-funcs
-
-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}.tar.gz
-
https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libbpf-0.8:=
- =dev-util/bcc-0.13.0:=
- dev-util/systemtap
-
-Date: Thu, 25 Aug 2022 21:47:30 +0900
-Subject: [PATCH] Fix builds against bcc >= 0.25.0
-
-libbpf 1.0.0 removed bpf_load_program_attr in
-https://github.com/libbpf/libbpf/commit/9476dce6fe905a6bf1d4c483f7b2b8575c4ffb2d
-and bcc 0.25.0 in turn changed bcc_prog_load_xattr to use
-bpf_prog_load_opts instead in
-https://github.com/iovisor/bcc/commit/185143bdec6134255363446f644acd766ffb3825
-
-Add a compile check to use the appropriate version
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5c4c39630d2..f23b2ba52740 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ check_symbol_exists(bpf_attach_kfunc
"${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_
- check_symbol_exists(bcc_usdt_addsem_probe
"${LIBBCC_INCLUDE_DIRS}/bcc/bcc_usdt.h" HAVE_BCC_USDT_ADDSEM)
- check_symbol_exists(bcc_procutils_which_so
"${LIBBCC_INCLUDE_DIRS}/bcc/bcc_proc.h" HAVE_BCC_WHICH_SO)
-
--# bcc_prog_load_xattr needs struct bpf_load_program_attr,
-+# bcc_prog_load_xattr needs struct bpf_prog_load_opts or
bpf_load_program_attr,
- # which is defined in libbpf
- if (LIBBPF_FOUND)
- check_symbol_exists(bcc_prog_load_xattr
"${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_BCC_PROG_LOAD_XATTR)
-@@ -236,6 +236,10 @@ if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
- set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}"
LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
- endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-
-+if(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
-+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
-+endif(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
-+
- if (HAVE_BCC_KFUNC)
- set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" HAVE_BCC_KFUNC)
- endif(HAVE_BCC_KFUNC)
-diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake
-index 7b4f12835786..20d2e68cd75f 100644
a/cmake/FindLibBcc.cmake
-+++ b/cmake/FindLibBcc.cmake
-@@ -85,6 +85,16 @@ int main(void) {
- return 0;
- }
- " LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-+CHECK_CXX_SOURCE_COMPILES("
-+#include
-+
-+int main(void) {
-+ struct bpf_prog_load_opts *opts = (struct bpf_prog_load_opts*) 1;
-+
-+ bcc_prog_load_xattr(BPF_PROG_TYPE_UNSPEC, 0, 0, 0, opts, 0, 0, 0, true);
-+ return 0;
-+}
-+" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
- SET(CMAKE_REQUIRED_INCLUDES)
-
- SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_BPF_LIBRARIES})
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index 60778e53ce44..dd46f15fd8d2 100644
a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -731,7 +731,24 @@ void AttachedProbe::load_prog()
- continue;
- }
-
--#ifdef HAVE_BCC_PROG_LOAD_XATTR
-+#ifdef LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS
-+struct bpf_prog_load_opts opts = { };
-+
-+opts.sz = sizeof(opts);
-+opts.log_level = log_level;
-+
-+progfd_ = bcc_prog_load_xattr(
-+progtype(probe_.type),
-+name.c_str(),
-+license,
-+reinterpret_cast(insns),
-+&opts,
-+prog_len,
-+log_buf.get(),
-+log_buf_size,
-+true);
-+
-+#elif HAVE_BCC_PROG_LOAD_XATTR
- struct bpf_load_program_attr attr = {};
-
- attr.prog_type = progtype(probe_.type);
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch
b/dev-util/bpftrace/fil
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 90756882da5d06a2e4b4e7d0f718d97dad65f136
Author: Patrick McLean gentoo org>
AuthorDate: Mon Jan 30 19:08:08 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Jan 30 19:10:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90756882
dev-util/bpftrace: add 0.17.0
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 3 +-
dev-util/bpftrace/bpftrace-0.17.0.ebuild | 95 ++
.../files/bpftrace-0.17.0-install-libs.patch | 327 +
3 files changed, 423 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 308364d6afc1..d51f5f17e321 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
-DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B
69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396
SHA512
3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
-DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B
3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4
SHA512
916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B
20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e
SHA512
52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
+DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B
960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e
SHA512
b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3
diff --git a/dev-util/bpftrace/bpftrace-0.17.0.ebuild
b/dev-util/bpftrace/bpftrace-0.17.0.ebuild
new file mode 100644
index ..e2084dacecf4
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.17.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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.0:=
+ >=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 d01d1ea3..7d96587f 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,21 +1,21 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-add_library(arch aarch64.cpp)
++add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
+-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_PROCESS
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 1d68a256d8d1ee428ce51403bb5d2b443ad29a19
Author: Patrick McLean gentoo org>
AuthorDate: Thu Jan 26 18:56:42 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Jan 26 18:56:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d68a256
dev-util/bpftrace: Pull in OpaquePointer fix for 0.16 (bug #890672)
Closes: https://bugs.gentoo.org/890672
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild| 93 +
.../files/bpftrace-0.16.0-opaquepointer.patch | 450 +
2 files changed, 543 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild
new file mode 100644
index ..dca9044e1ff0
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+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.0:=
+ >=dev-util/bcc-0.25.0:=
+
+Date: Mon Oct 10 14:26:38 2022 +0200
+
+IR builder: get rid of getPointerElementType calls
+
+Usage of Value::getPointerElementType is deprecated and will be dropped
+in LLVM 16 [1].
+
+There are several places where we use this method:
+- function (value) calls - the called function type is usually
+ available, so just pass it to createCall, the only exception is
+ CreateProbeReadStr which must have been refactored
+- getting the type of alloca instruction - there is a dedicated
+ AllocaInst::getAllocatedType method that can be used instead
+- strncmp - pass sizes of the strings to CreateStrncmp to be able to get
+ the correct string type (which is array of uint8)
+
+[1] https://llvm.org/docs/OpaquePointers.html
+
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index 09ae1c5e..da120ba1 100644
+--- a/src/ast/irbuilderbpf.cpp
b/src/ast/irbuilderbpf.cpp
+@@ -291,17 +291,16 @@ CallInst
*IRBuilderBPF::CreateHelperCall(libbpf::bpf_func_id func_id,
+ Constant *helper_func = ConstantExpr::getCast(Instruction::IntToPtr,
+ getInt64(func_id),
+ helper_ptr_type);
+- return createCall(helper_func, args, Name);
++ return createCall(helper_type, helper_func, args, Name);
+ }
+
+-CallInst *IRBuilderBPF::createCall(Value *callee,
++CallInst *IRBuilderBPF::createCall(FunctionType *callee_type,
++ Value *callee,
+ArrayRef args,
+const Twine &Name)
+ {
+ #if LLVM_VERSION_MAJOR >= 11
+- auto *calleePtrType = cast(callee->getType());
+- auto *calleeType =
cast(calleePtrType->getPointerElementType());
+- return CreateCall(calleeType, callee, args, Name);
++ return CreateCall(callee_type, callee, args, Name);
+ #else
+ return CreateCall(callee, args, Name);
+ #endif
+@@ -310,7 +309,7 @@ CallInst *IRBuilderBPF::createCall(Value *callee,
+ CallInst *IRBuilderBPF::CreateBpfPseudoCallId(int mapid)
+ {
+ Function *pseudo_func = module_.getFunction("llvm.bpf.pseudo");
+- return createCall(pseudo_func,
++ return CreateCall(pseudo_func,
+ { getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapid) },
+ "pseudo");
+ }
+@@ -349,7 +348,8 @@ CallInst *IRBuilderBPF::createMapLookup(int mapid, Value
*key)
+ Instruction::IntToPtr,
+ getInt64(libbpf::BPF_FUNC_map_lookup_elem),
+ lookup_func_ptr_type);
+- return createCall(lookup_func, { map_ptr, key }, "lookup_elem");
++ return createCall(
++ lookup_func_type, lookup_func, { map_ptr, key }, "lookup_elem");
+ }
+
+ CallInst *IRBuilderBPF::CreateGetJoinMap(Value *ctx, const location &loc)
+@@ -400,8 +400,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
+ CREATE_MEMCPY(value, call, type.GetSize(), 1);
+ else
+ {
+-assert(value->getType()->isPointerTy() &&
+- (value->getType()->getPointerElementType() == getInt64Ty()));
++assert(value->getAllocatedType() == getInt64Ty());
+ // createMapLookup returns an u8*
+ auto *cast = CreatePointerCast(call, value->getType(), "cast");
+ CreateStore(CreateLoad(getInt64Ty(), cast), value);
+@@ -451,7 +450,8 @@ void IRBuilderBPF::CreateMapUpdateElem(Value *ctx,
+ Instruction::IntToPtr,
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 076a7638d504bd9e5d1ca454f71ff79394e02196
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jan 13 18:39:55 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jan 13 18:40:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076a7638
dev-util/bpftrace: Revbump, add ~ keywords, drop systemtap dep
Signed-off-by: Patrick McLean gentoo.org>
.../bpftrace/{bpftrace-0.16.0.ebuild => bpftrace-0.16.0-r1.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
similarity index 97%
rename from dev-util/bpftrace/bpftrace-0.16.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
index 50e8366f23c0..3f624490bfe6 100644
--- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
# remove keywords until build works:
# https://github.com/iovisor/bpftrace/issues/2349
-#KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="fuzzing test"
# lots of fixing needed
@@ -27,7 +27,6 @@ RESTRICT="test"
RDEPEND="
>=dev-libs/libbpf-1.0:=
>=dev-util/bcc-0.25.0:=
- dev-util/systemtap
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: acb037045e266eb3bbc2a1749380d1f06be33bff Author: David Seifert gentoo org> AuthorDate: Wed Dec 7 13:51:40 2022 + Commit: David Seifert gentoo org> CommitDate: Wed Dec 7 13:51:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb03704 dev-util/bpftrace: remove sys-apps/sed from BDEPEND Signed-off-by: David Seifert gentoo.org> dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild | 1 - dev-util/bpftrace/bpftrace-0.16.0.ebuild| 1 - 2 files changed, 2 deletions(-) diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild index 1095ed8e6fd3..b4161428fb8c 100644 --- a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild +++ b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild @@ -39,7 +39,6 @@ DEPEND=" test? ( dev-cpp/gtest ) " BDEPEND=" - sys-apps/sed app-arch/xz-utils sys-devel/flex sys-devel/bison diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0.ebuild index 26206e9ed27f..f93bf5ae5f47 100644 --- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild +++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild @@ -39,7 +39,6 @@ DEPEND=" test? ( dev-cpp/gtest ) " BDEPEND=" - sys-apps/sed app-arch/xz-utils sys-devel/flex sys-devel/bison
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: cea2bfa609156c6fd237b0dd2db73122c69d0e28
Author: Yixun Lan gentoo org>
AuthorDate: Sun Oct 9 15:05:43 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Sun Oct 9 15:05:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea2bfa6
dev-util/bpftrace: fix ebuild after dropping patch
Fixes: "dev-util/bpftrace: drop empty patch"
Signed-off-by: Yixun Lan gentoo.org>
dev-util/bpftrace/bpftrace-0.16.0.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
index 6f9fca048fd6..26206e9ed27f 100644
--- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -55,7 +55,6 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.16.0-install-libs.patch"
"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
- "${FILESDIR}/bpftrace-0.16.0-link.patch"
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: 66fccd2e23fc467a967da7de4e83232d5e753e0b Author: Sam James gentoo org> AuthorDate: Tue Sep 27 21:42:18 2022 + Commit: Sam James gentoo org> CommitDate: Tue Sep 27 21:42:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fccd2e dev-util/bpftrace: drop empty patch Signed-off-by: Sam James gentoo.org> dev-util/bpftrace/files/bpftrace-0.16.0-link.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dev-util/bpftrace/files/bpftrace-0.16.0-link.patch b/dev-util/bpftrace/files/bpftrace-0.16.0-link.patch deleted file mode 100644 index e69de29bb2d1..
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 4d4bcc14d16dfcab91d9bdce6fb920ec95511da4
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Mon Sep 26 08:51:49 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 27 21:41:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4bcc14
dev-util/bpftrace: add fix to work properly with LLVM-15
Closes: https://bugs.gentoo.org/872842
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Signed-off-by: Sam James gentoo.org>
...-0.15.0-r1.ebuild => bpftrace-0.15.0-r2.ebuild} | 1 +
.../files/bpftrace-0.15.0-llvm-15-pointers.patch | 30 ++
2 files changed, 31 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
similarity index 97%
rename from dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
rename to dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
index 566a14a29b4a..1095ed8e6fd3 100644
--- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
"${FILESDIR}/bpftrace-0.15.0-bcc-025.patch"
"${FILESDIR}/bpftrace-0.15.0-binutils-2.39.patch"
+ "${FILESDIR}/bpftrace-0.15.0-llvm-15-pointers.patch"
)
pkg_pretend() {
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
new file mode 100644
index ..51ea034b9a88
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch
@@ -0,0 +1,30 @@
+
+From: https://github.com/iovisor/bpftrace/pull/2367
+Bug: https://bugs.gentoo.org/872842
+
+From 07fa48a94ef6d6bb1f335de345de18fe9776ca57 Mon Sep 17 00:00:00 2001
+From: kenneth topp
+Date: Mon, 26 Sep 2022 00:33:29 -0400
+Subject: [PATCH] Workaround OpaquePointers for LLVM 15
+
+This workaround allows bpftrace to be compiled against
+LLVM-15. This will have to be address properly before LLVM-16
+More details from LLVM here: https://llvm.org/docs/OpaquePointers.html
+---
+ src/ast/irbuilderbpf.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index d49883f786..00f0f172ff 100644
+--- a/src/ast/irbuilderbpf.cpp
b/src/ast/irbuilderbpf.cpp
+@@ -123,6 +123,9 @@ IRBuilderBPF::IRBuilderBPF(LLVMContext &context,
+ module_(module),
+ bpftrace_(bpftrace)
+ {
++#if LLVM_VERSION_MAJOR == 15
++ context.setOpaquePointers(false);
++#endif
+ // Declare external LLVM function
+ FunctionType *pseudo_func_type = FunctionType::get(
+ getInt64Ty(),
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: cf70312299b8b26e36c9eba0439d8527f8b8d9aa
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Mon Sep 26 08:55:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 27 21:41:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf703122
dev-util/bpftrace: unkeyword 0.16.0 until it actually builds
Bug: https://github.com/iovisor/bpftrace/issues/2349
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/27471
Signed-off-by: Sam James gentoo.org>
dev-util/bpftrace/bpftrace-0.16.0.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
index b6ef7864928b..6f9fca048fd6 100644
--- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -15,7 +15,10 @@ S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+#KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="fuzzing test"
# lots of fixing needed
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 50caae9a0f768143a2d4878ed8f5916bc9b682dd Author: Patrick McLean gentoo org> AuthorDate: Thu Sep 22 20:10:46 2022 + Commit: Patrick McLean gentoo org> CommitDate: Thu Sep 22 20:11:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50caae9a dev-util/bpftrace: Drop unused inherit from 0.16.0 Signed-off-by: Patrick McLean gentoo.org> dev-util/bpftrace/bpftrace-0.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0.ebuild index 210d78fe7f33..b6ef7864928b 100644 --- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild +++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 LLVM_MAX_SLOT=16 -inherit llvm linux-info cmake toolchain-funcs +inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" HOMEPAGE="https://github.com/iovisor/bpftrace";
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 25d51527d29fc9d8d269f2a9d4c96b640b2cbf52
Author: Patrick McLean gentoo org>
AuthorDate: Thu Sep 22 19:04:01 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Sep 22 19:04:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d51527
dev-util/bpftrace: add 0.16.0 (bug #868519)
Closes: https://bugs.gentoo.org/868519
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.16.0.ebuild | 92 +
.../files/bpftrace-0.16.0-install-libs.patch | 210 +
dev-util/bpftrace/files/bpftrace-0.16.0-link.patch | 0
4 files changed, 303 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f594b9b845c0..308364d6afc1 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B
69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396
SHA512
3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B
3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4
SHA512
916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
+DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B
20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e
SHA512
52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
new file mode 100644
index ..210d78fe7f33
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+inherit llvm linux-info cmake toolchain-funcs
+
+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"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libbpf-1.0:=
+ >=dev-util/bcc-0.25.0:=
+ dev-util/systemtap
+ 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 runtime 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 127c3528..4e05d40a 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,17 +1,19 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-add_library(arch aarch64.cpp)
++add_library(bpftracearch aarch64.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)
+ 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 014295cd..c35f6ac6 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
+ int_parser.cpp
+@@ -20,11 +20,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_directori
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: c026e499608c9a6a71ad316d526d5e46d03690ef
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Wed Sep 14 05:33:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 17 21:41:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c026e499
dev-util/bpftrace: fix build failure with binutils-2.39
Closes: https://bugs.gentoo.org/868120
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/27243
Signed-off-by: Sam James gentoo.org>
dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild| 1 +
.../files/bpftrace-0.15.0-binutils-2.39.patch | 87 ++
2 files changed, 88 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
index 51346cb3d38d..566a14a29b4a 100644
--- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
"${FILESDIR}/bpftrace-0.15.0-bcc-025.patch"
+ "${FILESDIR}/bpftrace-0.15.0-binutils-2.39.patch"
)
pkg_pretend() {
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch
new file mode 100644
index ..cb4b8a9bb2d2
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch
@@ -0,0 +1,87 @@
+
+Patch taken from: https://github.com/iovisor/bpftrace/pull/2328
+Removed hunk #1 (CHANGELOG.md) since it conflicts and is not required.
+Bug: https://bugs.gentoo.org/868120
+
+From 3be6e708d514d3378a4fe985ab907643ecbc77ee Mon Sep 17 00:00:00 2001
+From: Viktor Malik
+Date: Mon, 15 Aug 2022 15:13:14 +0200
+Subject: [PATCH] Fix builds against libbfd(binutils) >=2.39
+
+Binutils 2.39 changed signature of the init_disassemble_info function by
+adding an extra parameter for styled printf function. Let CMake detect
+which of the versions is present and call it appropriately.
+---
+ CHANGELOG.md | 2 ++
+ CMakeLists.txt | 3 +++
+ cmake/FindLibBfd.cmake | 10 ++
+ src/bfd-disasm.cpp | 14 ++
+ 4 files changed, 29 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f7995afd2..2e54eb84f8 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -249,6 +249,9 @@ if(HAVE_BFD_DISASM)
+ if(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE)
+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE)
+ endif(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE)
++ if(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE)
++set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}"
LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE)
++ endif(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE)
+ endif(HAVE_BFD_DISASM)
+
+ if (LIBBPF_BTF_DUMP_FOUND)
+diff --git a/cmake/FindLibBfd.cmake b/cmake/FindLibBfd.cmake
+index 4f4b8c4e20..5d917b188c 100644
+--- a/cmake/FindLibBfd.cmake
b/cmake/FindLibBfd.cmake
+@@ -75,5 +75,15 @@ int main(void) {
+abfd);
+ return 0;
+ }" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE)
++CHECK_CXX_SOURCE_COMPILES("
++// See comment in bfd-disasm.cpp for why this needs to exist
++#define PACKAGE \"bpftrace-test\"
++#include
++
++int main(void) {
++ init_disassemble_info(NULL, NULL, NULL, NULL);
++ return 0;
++}
++" LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE)
+ SET(CMAKE_REQUIRED_LIBRARIES)
+ endif()
+diff --git a/src/bfd-disasm.cpp b/src/bfd-disasm.cpp
+index f846468cd8..d4165dfac5 100644
+--- a/src/bfd-disasm.cpp
b/src/bfd-disasm.cpp
+@@ -38,6 +38,16 @@ static int fprintf_nop(void *out __attribute__((unused)),
const char *fmt __attr
+ return 0;
+ }
+
++#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE
++static int fprintf_styled_nop(void *out __attribute__((unused)),
++ enum disassembler_style s
__attribute__((unused)),
++ const char *fmt __attribute__((unused)),
++ ...)
++{
++ return 0;
++}
++#endif
++
+ static AlignState is_aligned_buf(void *buf, uint64_t size, uint64_t offset)
+ {
+ disassembler_ftype disassemble;
+@@ -55,7 +65,11 @@ static AlignState is_aligned_buf(void *buf, uint64_t size,
uint64_t offset)
+ return AlignState::Fail;
+ }
+
++#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE
++ init_disassemble_info(&info, stdout, fprintf_nop, fprintf_styled_nop);
++#else
+ init_disassemble_info(&info, stdout, fprintf_nop);
++#endif
+
+ info.arch = bfd_get_arch(bfdf);
+ info.mach = bfd_get_mach(bfdf);
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 542f1c70470d93d8f66fb8ef04ece7fb83221512
Author: Patrick McLean gentoo org>
AuthorDate: Mon Aug 29 17:39:38 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Aug 29 17:39:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542f1c70
dev-util/bpftrace: Add patch to build with bcc-0.25 (bug #866611)
Closes: https://bugs.gentoo.org/866611
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild| 1 +
.../bpftrace/files/bpftrace-0.15.0-bcc-025.patch | 88 ++
2 files changed, 89 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
index 1b080a8637d2..51346cb3d38d 100644
--- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.15.0-install-libs.patch"
"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.15.0-bcc-025.patch"
)
pkg_pretend() {
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch
new file mode 100644
index ..ef2ca76e1c50
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch
@@ -0,0 +1,88 @@
+From f86c3bde84d9e75ec2780a51a1ca7dc20a4740e6 Mon Sep 17 00:00:00 2001
+From: Dominique Martinet
+Date: Thu, 25 Aug 2022 21:47:30 +0900
+Subject: [PATCH] Fix builds against bcc >= 0.25.0
+
+libbpf 1.0.0 removed bpf_load_program_attr in
+https://github.com/libbpf/libbpf/commit/9476dce6fe905a6bf1d4c483f7b2b8575c4ffb2d
+and bcc 0.25.0 in turn changed bcc_prog_load_xattr to use
+bpf_prog_load_opts instead in
+https://github.com/iovisor/bcc/commit/185143bdec6134255363446f644acd766ffb3825
+
+Add a compile check to use the appropriate version
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5c4c39630d2..f23b2ba52740 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -138,7 +138,7 @@ check_symbol_exists(bpf_attach_kfunc
"${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_
+ check_symbol_exists(bcc_usdt_addsem_probe
"${LIBBCC_INCLUDE_DIRS}/bcc/bcc_usdt.h" HAVE_BCC_USDT_ADDSEM)
+ check_symbol_exists(bcc_procutils_which_so
"${LIBBCC_INCLUDE_DIRS}/bcc/bcc_proc.h" HAVE_BCC_WHICH_SO)
+
+-# bcc_prog_load_xattr needs struct bpf_load_program_attr,
++# bcc_prog_load_xattr needs struct bpf_prog_load_opts or
bpf_load_program_attr,
+ # which is defined in libbpf
+ if (LIBBPF_FOUND)
+ check_symbol_exists(bcc_prog_load_xattr
"${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_BCC_PROG_LOAD_XATTR)
+@@ -236,6 +236,10 @@ if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}"
LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
+ endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
+
++if(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
++ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
++endif(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
++
+ if (HAVE_BCC_KFUNC)
+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" HAVE_BCC_KFUNC)
+ endif(HAVE_BCC_KFUNC)
+diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake
+index 7b4f12835786..20d2e68cd75f 100644
+--- a/cmake/FindLibBcc.cmake
b/cmake/FindLibBcc.cmake
+@@ -85,6 +85,16 @@ int main(void) {
+ return 0;
+ }
+ " LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
++CHECK_CXX_SOURCE_COMPILES("
++#include
++
++int main(void) {
++ struct bpf_prog_load_opts *opts = (struct bpf_prog_load_opts*) 1;
++
++ bcc_prog_load_xattr(BPF_PROG_TYPE_UNSPEC, 0, 0, 0, opts, 0, 0, 0, true);
++ return 0;
++}
++" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS)
+ SET(CMAKE_REQUIRED_INCLUDES)
+
+ SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_BPF_LIBRARIES})
+diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
+index 60778e53ce44..dd46f15fd8d2 100644
+--- a/src/attached_probe.cpp
b/src/attached_probe.cpp
+@@ -731,7 +731,24 @@ void AttachedProbe::load_prog()
+ continue;
+ }
+
+-#ifdef HAVE_BCC_PROG_LOAD_XATTR
++#ifdef LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS
++struct bpf_prog_load_opts opts = { };
++
++opts.sz = sizeof(opts);
++opts.log_level = log_level;
++
++progfd_ = bcc_prog_load_xattr(
++progtype(probe_.type),
++name.c_str(),
++license,
++reinterpret_cast(insns),
++&opts,
++prog_len,
++log_buf.get(),
++log_buf_size,
++true);
++
++#elif HAVE_BCC_PROG_LOAD_XATTR
+ struct bpf_load_program_attr attr = {};
+
+ attr.prog_type = progtype(probe_.type);
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: c1f7a17d2cabff1af47da1b1bccf0332879acada
Author: Patrick McLean gentoo org>
AuthorDate: Wed Aug 24 18:19:52 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Aug 24 18:20:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f7a17d
dev-util/bpftrace: Force gentoo.org>
dev-util/bpftrace/{bpftrace-0.15.0.ebuild => bpftrace-0.15.0-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-util/bpftrace/bpftrace-0.15.0.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
similarity index 98%
rename from dev-util/bpftrace/bpftrace-0.15.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
index cb4b8281e70b..1b080a8637d2 100644
--- a/dev-util/bpftrace/bpftrace-0.15.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
@@ -25,6 +25,7 @@ RESTRICT="test"
RDEPEND="
>=dev-libs/libbpf-0.8:=
+ =dev-util/bcc-0.13.0:=
dev-util/systemtap
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: 47cec63186c43f6a15fa3ac2275c2f4135906821
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Jun 29 08:59:05 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Jul 18 17:33:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47cec631
dev-util/bpftrace: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26137
Signed-off-by: Patrick McLean gentoo.org>
.../files/bpftrace-0.12.0-fuzzing-build.patch | 13 --
.../bpftrace/files/bpftrace-0.14-libbpf-0.6.patch | 17 --
.../files/bpftrace-0.14.0-dont-compress-man.patch | 45 -
.../bpftrace/files/bpftrace-0.14.0-fuzzing.patch | 18 --
.../files/bpftrace-0.14.0-install-libs.patch | 196 -
5 files changed, 289 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
deleted file mode 100644
index 30f03eb8ff28..
--- a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/fuzz_main.cpp b/src/fuzz_main.cpp
-index a08d0b03..82127be0 100644
a/src/fuzz_main.cpp
-+++ b/src/fuzz_main.cpp
-@@ -135,7 +135,7 @@ int fuzz_main(const char* data, size_t sz)
- struct utsname utsname;
- uname(&utsname);
- std::string ksrc, kobj;
--auto kdirs = get_kernel_dirs(utsname, !bpftrace.features_->has_btf());
-+auto kdirs = get_kernel_dirs(utsname, !bpftrace.feature_->has_btf());
- ksrc = std::get<0>(kdirs);
- kobj = std::get<1>(kdirs);
-
diff --git a/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch
b/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch
deleted file mode 100644
index e4a383dd69fc..
--- a/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 47a050e2..5dd5ff3f 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -123,10 +123,8 @@ endif(STATIC_LINKING)
-
- target_link_libraries(libbpftrace parser resources runtime aot ast arch
cxxdemangler_llvm)
-
--if (LIBBPF_BTF_DUMP_FOUND)
-- target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS})
-- target_link_libraries(runtime ${LIBBPF_LIBRARIES})
--endif(LIBBPF_BTF_DUMP_FOUND)
-+target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS})
-+target_link_libraries(runtime ${LIBBPF_LIBRARIES})
-
- if(HAVE_BFD_DISASM)
- if(STATIC_LINKING)
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
deleted file mode 100644
index 30f3b4a7c463..
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt
-index 6f785d9d..c046b79f 100644
a/man/adoc/CMakeLists.txt
-+++ b/man/adoc/CMakeLists.txt
-@@ -1,7 +1,5 @@
--find_program(GZIP gzip REQUIRED)
- find_program(ASCIIDOCTOR asciidoctor REQUIRED)
- file(GLOB FILES *.adoc)
--set(GZFILES "")
- foreach(FIL ${FILES})
- get_filename_component(NAME ${FIL} NAME_WE)
- set(MANPAGE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.8)
-@@ -10,12 +8,6 @@ foreach(FIL ${FILES})
- add_custom_command(OUTPUT ${MANPAGE_FILE}
- COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE}
- DEPENDS ${FIL})
--
-- add_custom_command(OUTPUT ${GZ_MANPAGE_FILE}
--COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE}
--DEPENDS ${MANPAGE_FILE})
--
-- list(APPEND GZFILES ${GZ_MANPAGE_FILE})
- endforeach()
--add_custom_target(adoc_man DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
-+add_custom_target(adoc_man DEPENDS ${FILES})
-+install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
-diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
-index 2a316cd9..2207cf80 100644
a/man/man8/CMakeLists.txt
-+++ b/man/man8/CMakeLists.txt
-@@ -1,12 +1,3 @@
--find_program(GZIP gzip REQUIRED)
- file(GLOB FILES *.8)
--set(GZFILES "")
--foreach(FIL ${FILES})
-- get_filename_component(NAME ${FIL} NAME)
-- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--DEPENDS ${FIL})
-- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
--endforeach()
- add_custom_target(man_man DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
-+install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
deleted file mode 100644
index 6c759a9e1ca1..
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
+++ /dev/null
@@ -1,18 +0,0 @
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: c5e6486c8ac710fa9b6bfcc64fdba0e45b96844a
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jun 27 17:30:22 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jun 27 17:30:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e6486c
dev-util/bpftrace: drop 0.14.1, 0.14.1-r1
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild | 96 -
dev-util/bpftrace/bpftrace-0.14.1.ebuild| 92 ---
3 files changed, 189 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 96ee56633f51..f594b9b845c0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B
69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396
SHA512
3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
-DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B
832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1
SHA512
0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B
3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4
SHA512
916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
diff --git a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
deleted file mode 100644
index f8e1dddbd01e..
--- a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=14
-
-inherit llvm linux-info cmake toolchain-funcs
-
-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}.tar.gz
-
https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
- https://github.com/iovisor/bpftrace";
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 948804562536b1d469f4c230c8ec44b3f46f0f16
Author: Patrick McLean gentoo org>
AuthorDate: Tue May 24 17:47:08 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue May 24 17:47:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94880456
dev-util/bpftrace: add 0.15.0
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.15.0.ebuild | 92 ++
.../files/bpftrace-0.15.0-dont-compress-man.patch | 47 +
.../files/bpftrace-0.15.0-install-libs.patch | 199 +
4 files changed, 339 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 1c4b3ff288a4..96ee56633f51 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B
69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396
SHA512
3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B
832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1
SHA512
0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
+DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B
3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4
SHA512
916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
diff --git a/dev-util/bpftrace/bpftrace-0.15.0.ebuild
b/dev-util/bpftrace/bpftrace-0.15.0.ebuild
new file mode 100644
index ..cb4b8281e70b
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.15.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=15
+
+inherit llvm linux-info cmake toolchain-funcs
+
+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}.tar.gz
+
https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libbpf-0.8:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+${MANPAGE_FILE}
+ DEPENDS ${FIL})
+
+-add_custom_command(OUTPUT ${GZ_MANPAGE_FILE}
+- COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE}
+- DEPENDS ${MANPAGE_FILE})
+-
+-list(APPEND GZFILES ${GZ_MANPAGE_FILE})
+ endforeach()
+- add_custom_target(adoc_man DEPENDS ${GZFILES})
+- install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++ add_custom_target(adoc_man DEPENDS ${FILES})
++ install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ else()
+ message(WARNING "asciidoctor not found, building without bpftrace manpage")
+ add_custom_target(adoc_man)
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index 2a316cd9..2207cf80 100644
+--- a/man/man8/CMakeLists.txt
b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip REQUIRED)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+- get_filename_component(NAME ${FIL} NAME)
+- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-DEPENDS ${FIL})
+- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
+-endforeach()
+ add_custom_target(man_man DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch
new file mode 100644
index ..b20e39e4d268
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch
@@ -0,0 +1,199 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5c4c396..4bc3e499 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -103,9 +103,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_direct
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: a601b8787b0ad44663bf96ee465dcf5d0ae3a918
Author: Patrick McLean gentoo org>
AuthorDate: Wed May 4 22:43:18 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed May 4 22:43:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a601b878
dev-util/bpftrace: update SRC_URI
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild| 7 +-
.../bpftrace/files/bpftrace-0.14.1-llvm14.patch| 813 -
3 files changed, 6 insertions(+), 815 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 649995620651..1c4b3ff288a4 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
+DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B
69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396
SHA512
3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B
832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1
SHA512
0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
diff --git a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
index 9917c9712eb7..f8e1dddbd01e 100644
--- a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
@@ -10,7 +10,10 @@ inherit llvm linux-info cmake toolchain-funcs
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}.tar.gz"
+SRC_URI="
+ https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+
https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
+"
S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
LICENSE="Apache-2.0"
@@ -51,7 +54,7 @@ PATCHES=(
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
"${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch"
- "${FILESDIR}/bpftrace-0.14.1-llvm14.patch"
+ "${WORKDIR}/bpftrace-0.14.1-llvm14.patch"
)
pkg_pretend() {
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.1-llvm14.patch
b/dev-util/bpftrace/files/bpftrace-0.14.1-llvm14.patch
deleted file mode 100644
index d2f34ab62bfa..
--- a/dev-util/bpftrace/files/bpftrace-0.14.1-llvm14.patch
+++ /dev/null
@@ -1,813 +0,0 @@
-commit 422847b71dc38d31d9b352b0058196bbe5a9e278
-Author: Viktor Malik
-Date: Mon Jan 10 16:41:05 2022 +0100
-
-Fix LLVM 13 warnings
-
-Since LLVM 13, CreateGEP and CreateLoad require explicit types.
-
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index f6d2d2c1..890e75f4 100644
a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -95,8 +95,8 @@ AllocaInst *IRBuilderBPF::CreateUSym(llvm::Value *val)
- Value *pid = CreateLShr(CreateGetPidTgid(), 32);
-
- // The extra 0 here ensures the type of addr_offset will be int64
-- Value *addr_offset = CreateGEP(buf, { getInt64(0), getInt32(0) });
-- Value *pid_offset = CreateGEP(buf, { getInt64(0), getInt32(1) });
-+ Value *addr_offset = CreateGEP(usym_t, buf, { getInt64(0), getInt32(0) });
-+ Value *pid_offset = CreateGEP(usym_t, buf, { getInt64(0), getInt32(1) });
-
- CreateStore(val, addr_offset);
- CreateStore(pid, pid_offset);
-@@ -402,7 +402,8 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
- if (needMemcpy(type))
- return value;
-
-- Value *ret = CreateLoad(value);
-+ // value is a pointer to i64
-+ Value *ret = CreateLoad(getInt64Ty(), value);
- CreateLifetimeEnd(value);
- return ret;
- }
-@@ -622,7 +623,10 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
- // bpftrace's args are internally represented as 64 bit integers. However,
- // the underlying argument (of the target program) may be less than 64
- // bits. So we must be careful to zero out unused bits.
--Value* reg = CreateGEP(ctx, getInt64(offset * sizeof(uintptr_t)),
"load_register");
-+Value *reg = CreateGEP(getInt8Ty(),
-+ ctx,
-+ getInt64(offset * sizeof(uintptr_t)),
-+ "load_register");
- AllocaInst *dst = CreateAllocaBPF(builtin.type, builtin.ident);
- Value *index_offset = nullptr;
- if (argument->valid & BCC_USDT_ARGUMENT_INDEX_REGISTER_NAME)
-@@ -633,7 +637,8 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
- LOG(FATAL) << "offset for register " << argument->index_register_name
-<< " not known";
- }
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 5dc4f047ea705f0d1e30572184cc999ce3e45e9a
Author: Patrick McLean gentoo org>
AuthorDate: Wed May 4 22:25:18 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed May 4 22:25:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc4f047
dev-util/bpftrace: Revbump, add support for llvm-14
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild| 93 +++
.../bpftrace/files/bpftrace-0.14.1-llvm14.patch| 813 +
2 files changed, 906 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
new file mode 100644
index ..9917c9712eb7
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=14
+
+inherit llvm linux-info cmake toolchain-funcs
+
+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}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+
+Date: Mon Jan 10 16:41:05 2022 +0100
+
+Fix LLVM 13 warnings
+
+Since LLVM 13, CreateGEP and CreateLoad require explicit types.
+
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index f6d2d2c1..890e75f4 100644
+--- a/src/ast/irbuilderbpf.cpp
b/src/ast/irbuilderbpf.cpp
+@@ -95,8 +95,8 @@ AllocaInst *IRBuilderBPF::CreateUSym(llvm::Value *val)
+ Value *pid = CreateLShr(CreateGetPidTgid(), 32);
+
+ // The extra 0 here ensures the type of addr_offset will be int64
+- Value *addr_offset = CreateGEP(buf, { getInt64(0), getInt32(0) });
+- Value *pid_offset = CreateGEP(buf, { getInt64(0), getInt32(1) });
++ Value *addr_offset = CreateGEP(usym_t, buf, { getInt64(0), getInt32(0) });
++ Value *pid_offset = CreateGEP(usym_t, buf, { getInt64(0), getInt32(1) });
+
+ CreateStore(val, addr_offset);
+ CreateStore(pid, pid_offset);
+@@ -402,7 +402,8 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
+ if (needMemcpy(type))
+ return value;
+
+- Value *ret = CreateLoad(value);
++ // value is a pointer to i64
++ Value *ret = CreateLoad(getInt64Ty(), value);
+ CreateLifetimeEnd(value);
+ return ret;
+ }
+@@ -622,7 +623,10 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
+ // bpftrace's args are internally represented as 64 bit integers. However,
+ // the underlying argument (of the target program) may be less than 64
+ // bits. So we must be careful to zero out unused bits.
+-Value* reg = CreateGEP(ctx, getInt64(offset * sizeof(uintptr_t)),
"load_register");
++Value *reg = CreateGEP(getInt8Ty(),
++ ctx,
++ getInt64(offset * sizeof(uintptr_t)),
++ "load_register");
+ AllocaInst *dst = CreateAllocaBPF(builtin.type, builtin.ident);
+ Value *index_offset = nullptr;
+ if (argument->valid & BCC_USDT_ARGUMENT_INDEX_REGISTER_NAME)
+@@ -633,7 +637,8 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
+ LOG(FATAL) << "offset for register " << argument->index_register_name
+<< " not known";
+ }
+- index_offset = CreateGEP(ctx,
++ index_offset = CreateGEP(getInt8Ty(),
++ ctx,
+getInt64(ioffset * sizeof(uintptr_t)),
+"load_register");
+ index_offset = CreateLoad(getInt64Ty(), index_offset);
+@@ -757,17 +762,18 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+ else
+ literal2 = std::nullopt;
+
++ auto *val1p = dyn_cast(val1->getType());
++ auto *val2p = dyn_cast(val2->getType());
+ #ifndef NDEBUG
+ if (!literal1)
+ {
+-PointerType *val1p = cast(val1->getType());
++assert(val1p);
+ assert(val1p->getElementType()->isArrayTy() &&
+val1p->getElementType()->getArrayElementType() == getInt8Ty());
+ }
+ if (!literal2)
+ {
+-PointerType *val2p = cast(val2->getType());
+-
++assert(val2p);
+ assert(val2p->getElementType()->isArrayTy() &&
+val2p->getElementType()->getArrayElementType() == getInt8Ty());
+ }
+@@ -799,7 +805,9 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+ l = getInt8(literal1->c_str()[i]);
+ else
+ {
+- auto *ptr_l = CreateGEP(val1, { getInt32(0), getInt32(i) });
++ auto *ptr_l = CreateGEP(val1p->getElementType(),
++ val1,
++ { getInt32(0), getInt32(i) });
+ l = CreateLoad(getInt8Ty(), ptr_l
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 32d9c66882278f0194f7679841b7413aab3a1579
Author: Jakov Smolić gentoo org>
AuthorDate: Fri Feb 11 19:47:41 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Fri Feb 11 19:47:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d9c668
dev-util/bpftrace: drop 0.14.0-r2, 0.14.0-r3, 0.14.0-r4
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild | 98 -
dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 88 --
dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild | 92 ---
4 files changed, 279 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 843099f25055..649995620651 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1 @@
-DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B
3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5
SHA512
78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B
832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1
SHA512
0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
deleted file mode 100644
index bb1d9b9bc095..
--- a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="fuzzing test"
-
-COMMON_DEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
- >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
- <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
- <=sys-devel/clang-13:=
- sys-libs/binutils-libs:=
- virtual/libelf
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/cereal:=
- test? ( dev-cpp/gtest )
-"
-RDEPEND="
- ${COMMON_DEPEND}
-"
-BDEPEND+="
- >=dev-util/cmake-3.8
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
- "${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
- "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
- "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
- "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=12 llvm_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs=(
- -DSTATIC_LINKING:BOOL=OFF
- -DBUILD_TESTING:BOOL=OFF
- -DBUILD_FUZZ:BOOL=$(usex fuzzing)
- -DENABLE_MAN:BOOL=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- doman man/man8/*.?
-}
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
deleted file mode 100644
index fb376800eda5..
--- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-
-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}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
- https://github.com/iovisor/bpftrace";
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: f6d4396024e9b3f56bc81f9e105ac0a10eeb3e91
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jan 31 19:40:23 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jan 31 19:40:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d43960
dev-util/bpftrace: Keyword 0.14.1 arm64, #820392
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/bpftrace-0.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
index 81645fe66617..91157b21ad7e 100644
--- a/dev-util/bpftrace/bpftrace-0.14.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="fuzzing test"
# lots of fixing needed
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: df70a7fdce444abb09a00e6ed7a370cdaf28a93f
Author: Patrick McLean gentoo org>
AuthorDate: Thu Jan 6 17:18:42 2022 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Jan 6 17:19:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df70a7fd
dev-util/bpftrace: Version bump to 0.14.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.14.1.ebuild | 92
2 files changed, 93 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index dc83538e89dc..843099f25055 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B
3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5
SHA512
78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
+DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B
832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1
SHA512
0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
new file mode 100644
index ..81645fe66617
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+
+inherit llvm linux-info cmake toolchain-funcs
+
+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}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: f4b77bb08825192341013f4dc066671ce32241f1
Author: Sam James gentoo org>
AuthorDate: Sun Dec 5 03:23:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 5 03:26:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b77bb0
dev-util/bpftrace: fix pkg-config call
Signed-off-by: Sam James gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
index 0aeeffbf10f6..0147c758f292 100644
--- a/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LLVM_MAX_SLOT=13
-inherit llvm linux-info cmake
+inherit llvm linux-info cmake toolchain-funcs
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
@@ -78,7 +78,7 @@ src_configure() {
-DBUILD_TESTING:BOOL=OFF
-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-DENABLE_MAN:BOOL=OFF
- -DLIBBPF_INCLUDE_DIRS="$(pkg-config --cflags-only-I libbpf |
sed 's:-I::g')"
+ -DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I
libbpf | sed 's:-I::g')"
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 935ed96e4e87c521f1204bea27629d045e3e66bf
Author: Patrick McLean gentoo org>
AuthorDate: Thu Dec 2 18:02:04 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Dec 2 18:02:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935ed96e
dev-util/bpftrace: Remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild| 88 -
.../files/bpftrace-0.10.0-dont-compress-man.patch | 18 ---
.../files/bpftrace-0.13.0-install-libs.patch | 145 -
4 files changed, 252 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f2b2d8765fc0..dc83538e89dc 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1 @@
-DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B
8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc
SHA512
16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B
3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5
SHA512
78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
diff --git a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
deleted file mode 100644
index bf4eda842dfa..
--- a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="fuzzing test"
-
-COMMON_DEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
- >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
- <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
- <=sys-devel/clang-13:=
- sys-libs/binutils-libs:=
- virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
- >=dev-util/cmake-3.8
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
- "${FILESDIR}/bpftrace-0.13.0-install-libs.patch"
- "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
- "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
- "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=12 llvm_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs=(
- -DSTATIC_LINKING:BOOL=OFF
- -DBUILD_TESTING:BOOL=OFF
- -DBUILD_FUZZ:BOOL=$(usex fuzzing)
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
deleted file mode 100644
index 750ed4f712a3..
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
-index f1fc334..7ee58ed 100644
a/man/man8/CMakeLists.txt
-+++ b/man/man8/CMakeLists.txt
-@@ -1,12 +1,3 @@
--find_program(GZIP gzip)
- file(GLOB FILES *.8)
--set(GZFILES "")
--foreach(FIL ${FILES})
-- get_filename_component(NAME ${FIL} NAME)
-- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--DEPENDS ${FIL})
-- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
--endforeach()
- add_custom_target(man ALL DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
-+install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
b
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: ef0f3b1bb4c6bfb876c0af6cb1bcddff39dcef3b
Author: Patrick McLean gentoo org>
AuthorDate: Thu Dec 2 17:30:33 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Dec 2 17:30:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0f3b1b
dev-util/bpftrace: Fix build with libbpf-0.6.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild| 92 ++
.../bpftrace/files/bpftrace-0.14-libbpf-0.6.patch | 17
2 files changed, 109 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
new file mode 100644
index ..0aeeffbf10f6
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+
+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}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: c0524e3d31d3137106289f106c2747e1473b7d0f
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Nov 10 17:09:33 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Nov 10 17:16:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0524e3d
dev-util/bpftrace: remove unused patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22887
Signed-off-by: Jakov Smolić gentoo.org>
.../files/bpftrace-0.12.0-install-libs.patch | 161 -
1 file changed, 161 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
deleted file mode 100644
index 04c08b3efa8..000
--- a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4544559..272ea18d 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,9 +92,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a1..f5c4d676 100644
a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
-
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- function(embed_headers output)
- file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 37ee2204..8b2e1909 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
- target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
- endif(ALLOW_UNSAFE_PROBE)
-
--target_link_libraries(libbpftrace arch ast parser resources)
-+target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser
bpftraceresources)
-+install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR})
-
- target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
- if(STATIC_LINKING)
-@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
- endif()
-
- install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
- if (KERNEL_HEADERS_DIR)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 76bb217e..6d243a7e 100644
a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,15 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--add_library(arch aarch64.cpp)
-+add_library(bpftracearch aarch64.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)
- else()
- message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
- endif()
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 3d444fb4..c2cf84ed 100644
a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
- ast.cpp
- attachpoint_parser.cpp
- callback_visitor.cpp
-@@ -11,17 +11,18 @@ add_library(ast
- signal.cpp
- visitors.cpp
- )
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--targ
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 60de8e70702bfab245f02fe50fe0f742dfc097a2
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 20:58:19 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 20:58:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60de8e70
dev-util/bpftrace: drop 0.12.1-r1
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild | 88 -
2 files changed, 89 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 62e26ac7c80..f2b2d8765fc 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
-DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
SHA512
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B
8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc
SHA512
16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B
3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5
SHA512
78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
diff --git a/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
deleted file mode 100644
index c36af3ddcf9..000
--- a/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="fuzzing test"
-
-COMMON_DEPEND="
- dev-libs/libbpf:=
- >=dev-util/bcc-0.13.0:=
- dev-util/systemtap
- >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
- <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
- <=sys-devel/clang-13:=
- sys-libs/binutils-libs:=
- virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
- >=dev-util/cmake-3.8
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
- "${FILESDIR}/bpftrace-0.12.0-install-libs.patch"
- "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
- "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
- "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=12 llvm_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs=(
- -DSTATIC_LINKING:BOOL=OFF
- -DBUILD_TESTING:BOOL=OFF
- -DBUILD_FUZZ:BOOL=$(usex fuzzing)
- )
-
- cmake_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 8c5ccece6398aa27652a761dd4924cd95b3724bd Author: Jakov Smolić gentoo org> AuthorDate: Sun Nov 7 20:58:22 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Nov 7 20:58:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5ccece dev-util/bpftrace: add myself as a maintainer Signed-off-by: Jakov Smolić gentoo.org> dev-util/bpftrace/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml index 3e240d7784b..3b275bd1ca5 100644 --- a/dev-util/bpftrace/metadata.xml +++ b/dev-util/bpftrace/metadata.xml @@ -4,6 +4,10 @@ chutz...@gentoo.org + +jsmo...@gentoo.org +Jakov Smolić + Build bpftrace for fuzzing
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 61947df90f4bdc580a877d075047a6e2077ae280
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 20:58:12 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 20:58:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61947df9
dev-util/bpftrace: Reorganize deps, bump max llvm version
Closes: https://bugs.gentoo.org/820422
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 91 +
1 file changed, 91 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
new file mode 100644
index 000..abc8391c68e
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ inherit git-r3
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+ <=sys-devel/clang-14:=
+ <=sys-devel/llvm-14:=[llvm_targets_BPF(+)]
+ sys-libs/binutils-libs:=
+ virtual/libelf
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/cereal:=
+ test? ( dev-cpp/gtest )
+"
+BDEPEND+="
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+ "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=13 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DSTATIC_LINKING:BOOL=OFF
+ -DBUILD_TESTING:BOOL=OFF
+ -DBUILD_FUZZ:BOOL=$(usex fuzzing)
+ -DENABLE_MAN:BOOL=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ doman man/man8/*.?
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: e576dd19c0e1bdc56ad8e9f356490f456f8dc604
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 20:58:15 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 20:58:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e576dd19
dev-util/bpftrace: Statically link (partially), avoid stripping bpftrace
bpftrace is currently broken due to BEGIN_trigger symbol missing. To fix this,
we need to avoid stripping the binary since it clearly needs to have
symbols to work properly, and we also need to link some of the libraries
statically into the binary, namely some internal libraries provided by
bpftrace need to be statically linked, otherwise the binary will still
end up missing the needed symbol (upstream issue -
https://github.com/iovisor/bpftrace/issues/954). For previous versions
it was enough to skip stripping the binary, but BEGIN_trigger symbol was
moved to libbpftrace several versions ago, so even if it is present as
a .so library the symbol won't be found.
Closes: https://bugs.gentoo.org/809362
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
index efe4e68822d..4435e4c8379 100644
--- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs llvm linux-info cmake
+inherit llvm linux-info cmake
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
@@ -67,6 +67,7 @@ pkg_setup() {
src_configure() {
local -a mycmakeargs=(
-DSTATIC_LINKING:BOOL=OFF
+ -DBUILD_SHARED_LIBS:=OFF
-DBUILD_TESTING:BOOL=OFF
-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-DENABLE_MAN:BOOL=OFF
@@ -77,5 +78,6 @@ src_configure() {
src_install() {
cmake_src_install
+ dostrip -x /usr/bin/bpftrace
doman man/man8/*.?
}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 073fb10f6fedaf9dc92fc31edf912e4b5076e00c Author: Jakov Smolić gentoo org> AuthorDate: Sun Nov 7 20:58:21 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Nov 7 20:58:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073fb10f dev-util/bpftrace: Drop unused toolchain-funcs in 0.13.0-r1 and 0.14.0-r2 Signed-off-by: Jakov Smolić gentoo.org> dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild | 2 +- dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild index 3437f2e80ce..bf4eda842df 100644 --- a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild +++ b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs llvm linux-info cmake +inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" HOMEPAGE="https://github.com/iovisor/bpftrace"; diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild index 483f341c490..bb1d9b9bc09 100644 --- a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild +++ b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs llvm linux-info cmake +inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" HOMEPAGE="https://github.com/iovisor/bpftrace";
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 9af1ceff0ce358bd93f2e54e8f4a7ef496623d45
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 20:58:17 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 20:58:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af1ceff
dev-util/bpftrace: Fix includes in fuzz_main.cpp
Closes: https://bugs.gentoo.org/801385
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 1 +
dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch | 18 ++
2 files changed, 19 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
index 4435e4c8379..9f4a31fdf7b 100644
--- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
@@ -43,6 +43,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+ "${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
)
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
new file mode 100644
index 000..6c759a9e1ca
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
@@ -0,0 +1,18 @@
+https://github.com/iovisor/bpftrace/pull/2059
+--- a/src/fuzz_main.cpp
b/src/fuzz_main.cpp
+@@ -17,12 +17,12 @@
+ #include
+
+ #include "ast/bpforc/bpforc.h"
+-#include "ast/clang_parser.h"
++#include "clang_parser.h"
+ #include "ast/passes/callback_visitor.h"
+ #include "ast/passes/field_analyser.h"
+ #include "ast/passes/semantic_analyser.h"
+ #include "bpftrace.h"
+-#include "codegen_llvm.h"
++#include "ast/passes/codegen_llvm.h"
+ #include "driver.h"
+ #include "log.h"
+ #include "output.h"
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: f9884e3ae6a9e1434d875022c235ae4c12da59cb Author: Jakov Smolić gentoo org> AuthorDate: Sun Nov 7 20:58:29 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Nov 7 20:58:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9884e3a dev-util/bpftrace: Style changes Use LLVM_MAX_SLOT for delaring deps, add missing operator on virtual/libelf, add few bug references Signed-off-by: Jakov Smolić gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22848 Signed-off-by: Jakov Smolić gentoo.org> dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild index 9f4a31fdf7b..fb376800eda 100644 --- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild +++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild @@ -3,6 +3,8 @@ EAPI=7 +LLVM_MAX_SLOT=13 + inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" @@ -22,10 +24,10 @@ RDEPEND=" dev-libs/libbpf:= >=dev-util/bcc-0.13.0:= dev-util/systemtap - <=sys-devel/clang-14:= - <=sys-devel/llvm-14:=[llvm_targets_BPF(+)] +
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 10f8fc530a1115a751bc4c3756453c8700163947
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 20:58:14 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 20:58:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f8fc53
dev-util/bpftrace: Drop live ebuild skeleton
Signed-off-by: Jakov Smolić gentoo.org>
dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 22 ++
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
index abc8391c68e..efe4e68822d 100644
--- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
@@ -7,19 +7,13 @@ inherit toolchain-funcs llvm linux-info cmake
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- inherit git-r3
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
LICENSE="Apache-2.0"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="fuzzing test"
# lots of fixing needed
RESTRICT="test"
@@ -38,12 +32,12 @@ DEPEND="
dev-libs/cereal:=
test? ( dev-cpp/gtest )
"
-BDEPEND+="
+BDEPEND="
+ app-arch/xz-utils
sys-devel/flex
sys-devel/bison
"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
@@ -70,10 +64,6 @@ pkg_setup() {
LLVM_MAX_SLOT=13 llvm_pkg_setup
}
-src_prepare() {
- cmake_src_prepare
-}
-
src_configure() {
local -a mycmakeargs=(
-DSTATIC_LINKING:BOOL=OFF
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: b09a22354f2e86e5e2605292b9b6d555699f33f7
Author: Patrick McLean sony com>
AuthorDate: Wed Oct 27 01:18:33 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Oct 27 16:54:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09a2235
dev-util/bpftrace: Fix patch to make sure libaot is installed
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
...trace-0.14.0-r1.ebuild => bpftrace-0.14.0-r2.ebuild} | 0
.../bpftrace/files/bpftrace-0.14.0-install-libs.patch | 17 ++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild
rename to dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
index dc8e8905260..2e2484a2efe 100644
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
@@ -70,10 +70,18 @@ index 47a050e2..1bbcf882 100644
if (LIBBPF_BTF_DUMP_FOUND)
target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS})
diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt
-index 291d53f2..308691ee 100644
+index 291d53f2..22944ddc 100644
--- a/src/aot/CMakeLists.txt
+++ b/src/aot/CMakeLists.txt
-@@ -10,7 +10,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
+@@ -2,6 +2,7 @@ add_library(aot aot.cpp)
+ target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src)
+ target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR})
+ target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS})
++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ # Only build aotrt if supported bcc is used
+ #
(https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44)
+@@ -10,7 +11,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
endif()
add_executable(bpftrace-aotrt aot_main.cpp)
@@ -82,11 +90,6 @@ index 291d53f2..308691ee 100644
install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
# Linking
-@@ -27,3 +27,4 @@ if(BUILD_ASAN)
- target_compile_options(bpftrace-aotrt PUBLIC "-fsanitize=address")
- target_link_options(bpftrace-aotrt PUBLIC "-fsanitize=address")
- endif()
-+install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
index 76bb217e..4ad0f626 100644
--- a/src/arch/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 83059a7de54913700cdfe7d36391673c1b7ebcc9
Author: Patrick McLean sony com>
AuthorDate: Tue Oct 26 22:05:35 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Oct 26 22:07:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83059a7d
dev-util/bpftrace: bump fix install of ast lib (bug # 784332)
Closes: https://bugs.gentoo.org/784332
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
.../{bpftrace-0.14.0.ebuild => bpftrace-0.14.0-r1.ebuild}| 0
dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch | 9 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.14.0.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.14.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
index 00d35c6f49e..dc8e8905260 100644
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
@@ -115,7 +115,7 @@ index 76bb217e..4ad0f626 100644
+
+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 014295cd..b038aa18 100644
+index 014295cd..c35f6ac6 100644
--- a/src/ast/CMakeLists.txt
+++ b/src/ast/CMakeLists.txt
@@ -1,6 +1,6 @@
@@ -126,13 +126,14 @@ index 014295cd..b038aa18 100644
async_event_types.cpp
attachpoint_parser.cpp
int_parser.cpp
-@@ -20,11 +20,12 @@ add_library(ast
+@@ -20,11 +20,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 bpforc parser)
+target_link_libraries(bpftraceast ast_defs bpftracearch bpforc bpftraceparser)
+install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-add_dependencies(ast_defs parser)
+add_dependencies(ast_defs bpftraceparser)
@@ -142,7 +143,7 @@ index 014295cd..b038aa18 100644
if (STATIC_LINKING)
set(clang_libs
-@@ -55,11 +56,11 @@ if (STATIC_LINKING)
+@@ -55,11 +57,11 @@ if (STATIC_LINKING)
if(EMBED_USE_LLVM)
@@ -157,7 +158,7 @@ index 014295cd..b038aa18 100644
endif()
if(STATIC_LIBC)
-@@ -69,13 +70,13 @@ if (STATIC_LINKING)
+@@ -69,13 +71,13 @@ if (STATIC_LINKING)
else()
find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
if(found_LLVM)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 3a6dd727b27797569f9e9a9156691fe9487f3dcc
Author: Patrick McLean sony com>
AuthorDate: Tue Oct 26 17:52:59 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Oct 26 17:52:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6dd727
dev-util/bpftrace-0.14.0: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.14.0.ebuild | 98 +++
.../files/bpftrace-0.14.0-dont-compress-man.patch | 45 +
.../files/bpftrace-0.14.0-install-libs.patch | 192 +
4 files changed, 336 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 6f80ffa13ad..62e26ac7c80 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
SHA512
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B
8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc
SHA512
16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
+DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B
3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5
SHA512
78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
diff --git a/dev-util/bpftrace/bpftrace-0.14.0.ebuild
b/dev-util/bpftrace/bpftrace-0.14.0.ebuild
new file mode 100644
index 000..483f341c490
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+
+COMMON_DEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+ >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-13:=
+ sys-libs/binutils-libs:=
+ virtual/libelf
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/cereal:=
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+ "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=12 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DSTATIC_LINKING:BOOL=OFF
+ -DBUILD_TESTING:BOOL=OFF
+ -DBUILD_FUZZ:BOOL=$(usex fuzzing)
+ -DENABLE_MAN:BOOL=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
b/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
new file mode 100644
index 000..30f3b4a7c46
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-dont-compress-man.patch
@@ -0,0 +1,45 @@
+diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt
+index 6f785d9d..c046b79f 100644
+--- a/man/adoc/CMakeLists.txt
b/man/adoc/CMakeLists.txt
+@@ -1,7 +1,5 @@
+-find_program(GZIP gzip REQUIRED)
+ find_program(ASCIIDOCTOR asciidoctor REQUIRED)
+ file(GLOB FILES *.adoc)
+-set(GZFILES "
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: cf1ef9d692a509052c5ef64a6c34bec7000c4bf5
Author: Patrick McLean gentoo org>
AuthorDate: Tue Jul 13 21:07:27 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Jul 13 21:07:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1ef9d6
dev-util/bpftrace-0.13.0-r1: revbump, install lib (bug #801472)
Closes: https://bugs.gentoo.org/801472
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
.../bpftrace/{bpftrace-0.13.0.ebuild => bpftrace-0.13.0-r1.ebuild} | 0
dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch | 6 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.13.0.ebuild
b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.13.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
index 03fd2d13e60..fb75f9db1ba 100644
--- a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
@@ -52,10 +52,10 @@ index 0361cdaa..f9c536a3 100644
if (LIBBPF_BTF_DUMP_FOUND)
target_include_directories(libbpftrace PUBLIC ${LIBBPF_INCLUDE_DIRS})
diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 76bb217e..6d243a7e 100644
+index 76bb217e..4ad0f626 100644
--- a/src/arch/CMakeLists.txt
+++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,15 @@
+@@ -1,15 +1,17 @@
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-add_library(arch aarch64.cpp)
+add_library(bpftracearch aarch64.cpp)
@@ -76,6 +76,8 @@ index 76bb217e..6d243a7e 100644
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 5234388c..8b40faaa 100644
--- a/src/ast/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 235bbf5acbfecc780e991834acd4d0fee49ff7a1
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jul 9 17:11:23 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jul 9 17:11:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235bbf5a
dev-util/bpftrace: Remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 -
dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild| 89
dev-util/bpftrace/bpftrace-0.11.4.ebuild | 86
dev-util/bpftrace/bpftrace-.ebuild | 85 ---
.../files/bpftrace-0.11.0-install-libs.patch | 156 -
5 files changed, 417 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 482103e5556..6f80ffa13ad 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
-DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B
50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548
SHA512
611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82
DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
SHA512
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B
8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc
SHA512
16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
diff --git a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
deleted file mode 100644
index 76302016ee2..000
--- a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
- dev-util/systemtap
- dev-libs/libbpf:=
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
- <=sys-devel/clang-12:=
- >=dev-util/bcc-0.13.0:=
- virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
- >=dev-util/cmake-3.8
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-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
-RESTRICT="test"
-
-# https://bugs.gentoo.org/754648
-RESTRICT+=" strip"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs
- mycmakeargs=(
- "-DSTATIC_LINKING:BOOL=OFF"
- "-DBUILD_TESTING:BOOL=OFF"
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.4.ebuild
b/dev-util/bpftrace/bpftrace-0.11.4.ebuild
deleted file mode 100644
index a3a1fb79701..000
--- a/dev-util/bpftrace/bpftrace-0.11.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: be8e4e44dfb0c9dd8521dcdaa886e6efae106556
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jul 9 17:09:39 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jul 9 17:11:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8e4e44
dev-util/bpftrace-0.13.0: Version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.13.0.ebuild | 88 +
.../files/bpftrace-0.13.0-install-libs.patch | 143 +
3 files changed, 232 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index babfffac440..482103e5556 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B
50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548
SHA512
611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82
DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
SHA512
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
+DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B
8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc
SHA512
16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
diff --git a/dev-util/bpftrace/bpftrace-0.13.0.ebuild
b/dev-util/bpftrace/bpftrace-0.13.0.ebuild
new file mode 100644
index 000..3437f2e80ce
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.13.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+
+COMMON_DEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+ >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-13:=
+ sys-libs/binutils-libs:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.13.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+ "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=12 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DSTATIC_LINKING:BOOL=OFF
+ -DBUILD_TESTING:BOOL=OFF
+ -DBUILD_FUZZ:BOOL=$(usex fuzzing)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
new file mode 100644
index 000..03fd2d13e60
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
@@ -0,0 +1,143 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e33bb1ca..52e1fa25 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -100,9 +100,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: c1d1ece10f2f6dd3f34d59b0b4066f8f0d73eaa0
Author: Patrick McLean gentoo org>
AuthorDate: Tue Apr 20 18:04:10 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Apr 20 18:04:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d1ece1
dev-util/bpftrace-0.12.1-r1: revbump, fix up library installation
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
.../bpftrace/{bpftrace-0.12.1.ebuild => bpftrace-0.12.1-r1.ebuild} | 0
dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch | 7 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild
b/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.12.1.ebuild
rename to dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
index ef715ea5da8..04c08b3efa8 100644
--- a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
@@ -31,19 +31,20 @@ index a95c60a1..f5c4d676 100644
function(embed_headers output)
file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 37ee2204..d35574f5 100644
+index 37ee2204..8b2e1909 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -145,7 +145,7 @@ if (ALLOW_UNSAFE_PROBE)
+@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
endif(ALLOW_UNSAFE_PROBE)
-target_link_libraries(libbpftrace arch ast parser resources)
+target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser
bpftraceresources)
++install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR})
target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
if(STATIC_LINKING)
-@@ -194,6 +194,7 @@ if (USE_LIBFUZZER)
+@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
endif()
install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 816074b07b21e36ccfddd5df66c76277ea122c15
Author: Patrick McLean gentoo org>
AuthorDate: Tue Apr 20 03:30:38 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Apr 20 03:30:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816074b0
dev-util/bpftrace-0.12.1: Fix leftover usex check
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.12.1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild
b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
index cd944547539..c36af3ddcf9 100644
--- a/dev-util/bpftrace/bpftrace-0.12.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
@@ -82,7 +82,6 @@ src_configure() {
-DSTATIC_LINKING:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DBUILD_FUZZ:BOOL=$(usex fuzzing)
- -DUSE_LIBFUZZER:BOOL=$(usex libfuzzer)
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 86cdb30121712b13ba63c7f44019e70658a4e278
Author: Patrick McLean sony com>
AuthorDate: Mon Apr 19 23:49:47 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Apr 19 23:49:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cdb301
dev-util/bpftrace-0.12.1: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.12.1.ebuild | 89
.../files/bpftrace-0.12.0-fuzzing-build.patch | 13 ++
.../files/bpftrace-0.12.0-install-libs.patch | 160 +
dev-util/bpftrace/metadata.xml | 3 +
5 files changed, 266 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 786d756a582..babfffac440 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B
50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548
SHA512
611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82
+DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
SHA512
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild
b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
new file mode 100644
index 000..cd944547539
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+
+COMMON_DEPEND="
+ dev-libs/libbpf:=
+ >=dev-util/bcc-0.13.0:=
+ dev-util/systemtap
+ >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-13:=
+ sys-libs/binutils-libs:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.12.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+ "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+ "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=12 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DSTATIC_LINKING:BOOL=OFF
+ -DBUILD_TESTING:BOOL=OFF
+ -DBUILD_FUZZ:BOOL=$(usex fuzzing)
+ -DUSE_LIBFUZZER:BOOL=$(usex libfuzzer)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
new file mode 100644
index 000..30f03eb8ff2
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/fuzz_main.cpp b/src/fuzz_main.cpp
+index a08d0b03..82127be0 100644
+--- a/src/fuzz_main.cpp
b/src/fuzz_main.cpp
+@@ -135,7 +135,7 @@ int fuzz_main(const char* data, size_t sz)
+ struct utsname utsname;
+ uname(&utsname);
+ std::string ksrc, kobj;
+-auto kdirs = get_kernel_dirs(utsname, !bpftrace.features_->has_btf());
++auto kdirs = get_kernel_dirs(utsname, !bpftrace.feature_->has_btf());
+ ksrc = std::get<0>(kdirs);
+ kobj = std::get<1>(kdirs);
+
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
new file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 8b502ccf32895dc1f9cbecc165221022553d28b0
Author: Patrick McLean gentoo org>
AuthorDate: Wed Mar 24 23:59:01 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Mar 24 23:59:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b502ccf
dev-util/bpftrace-0.11.4-r1: revbump RESTRICT=strip (bug #754648)
Closes: https://bugs.gentoo.org/754648
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild | 89 +
1 file changed, 89 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
new file mode 100644
index 000..76302016ee2
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+ dev-util/systemtap
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-12:=
+ >=dev-util/bcc-0.13.0:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+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
+RESTRICT="test"
+
+# https://bugs.gentoo.org/754648
+RESTRICT+=" strip"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: a9a195700d0c2766fe95ffafb44708882ea9e54e
Author: Patrick McLean sony com>
AuthorDate: Fri Nov 27 19:00:50 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Nov 27 19:01:41 2020 +
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 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 000..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
++#include
+ #include
+ #include
+ #include
+@@ -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
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: 040b2310a46fb3ce023e2eae0e35def8bd3523da
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Nov 16 07:57:48 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri Nov 20 13:25:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040b2310
dev-util/bpftrace: remove unused patch
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18277
Signed-off-by: Aaron Bauman gentoo.org>
.../files/bpftrace-0.10.0-install-libs.patch | 148 -
1 file changed, 148 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
deleted file mode 100644
index cf5ed9d76b9..000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e89a6a9..efa2ff3 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,9 +90,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a..f5c4d67 100644
a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
-
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- function(embed_headers output)
- file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4fa0418..4d0c2a9 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,7 +75,8 @@ if (ALLOW_UNSAFE_PROBE)
- target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
- endif(ALLOW_UNSAFE_PROBE)
-
--target_link_libraries(bpftrace arch ast parser resources)
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+ bpftraceresources)
-
- target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
- if(STATIC_LINKING)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 7156276..32faeae 100644
a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,10 +1,12 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--add_library(arch aarch64.cpp)
-+add_library(bpftracearch aarch64.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 "x86_64")
--add_library(arch x86_64.cpp)
-+add_library(bpftracearch x86_64.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 0d58cd9..e33d585 100644
a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
- ast.cpp
- attachpoint_parser.cpp
- codegen_llvm.cpp
-@@ -8,16 +8,17 @@ add_library(ast
- semantic_analyser.cpp
- )
-
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast arch)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
-+target_link_libraries(bpftraceast bpftracearch)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- if (HAVE_KFUNC)
-- target_compile_definitions(ast PRIVATE HAVE_KFUNC)
-+ target_compile_definitions(bpftraceast PRIVATE HAVE_KFUNC)
- endif(HAVE_KFUNC)
-
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
-
- if (STATIC_LINKING)
- set(clang_libs
-@@ -41,26 +42,26 @@ if (STAT
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 20066342e901bdc2a5507e82091439a89b939fcd
Author: Patrick McLean gentoo org>
AuthorDate: Sat Nov 14 19:23:59 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Nov 14 19:27:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20066342
dev-util/bpftrace-0.11.3-r1: revbump, update libbpf dep
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/{bpftrace-0.11.3.ebuild => bpftrace-0.11.3-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/bpftrace-0.11.3.ebuild
b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
similarity index 98%
rename from dev-util/bpftrace/bpftrace-0.11.3.ebuild
rename to dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
index 2a14dc58476..b941fc56d71 100644
--- a/dev-util/bpftrace/bpftrace-0.11.3.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="test"
COMMON_DEPEND="
dev-util/systemtap
- =sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
<=sys-devel/clang-12:=
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 246efe903747c7a63efba8913a1949074fdbde35
Author: Patrick McLean gentoo org>
AuthorDate: Sat Nov 14 01:30:13 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Nov 14 01:30:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246efe90
dev-util/bpftrace: Remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 4 -
dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild| 80
dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild| 85 -
dev-util/bpftrace/bpftrace-0.11.1.ebuild | 85 -
dev-util/bpftrace/bpftrace-0.11.2.ebuild | 86 --
dev-util/bpftrace/bpftrace-.ebuild | 6 +-
.../files/bpftrace-0.10.0-llvm-multi.patch | 60 ---
.../bpftrace-0.10.0-no-bpf_detach_kfunc.patch | 13
8 files changed, 3 insertions(+), 416 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 04ce369b610..6aab218fe7e 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,5 +1 @@
-DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
-DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
-DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B
d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5
SHA512
361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250dff3
-DIST bpftrace-0.11.2.tar.gz 867724 BLAKE2B
6d0a10c8a4261277fc3a6e5f422e26238673dcd76abcae6bd8079cc98ee713d3d34d3e09284f5c79ba323d7203d6d944999da17f73ab2afbf1d403cb0dd1a392
SHA512
25bcc9863d24646108252f0010b96afb823eb795c8c6d94112b7804740d7688139ead7d862a205a1b44b86ef135b412e533fc119939ce550e5509b1bd37952fa
DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B
950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e
SHA512
76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
deleted file mode 100644
index 26c1753afef..000
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-util/systemtap
- sys-devel/clang:=
- dev-libs/libbpf:=
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- =dev-util/bcc-0.12.0:=
- virtual/libelf"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
- sys-devel/flex
- sys-devel/bison"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-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
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs
- mycmakeargs=(
- "-DSTATIC_LINKING:BOOL=OFF"
- "-DBUILD_TESTING:BOOL=OFF"
- )
-
- cmake-utils_src_configure
-}
diff --
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 42d54d0e82af0794b404da89d83a29fef51cc67d
Author: Patrick McLean gentoo org>
AuthorDate: Sat Nov 14 01:27:47 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Nov 14 01:27:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d54d0e
dev-util/bpftrace-0.11.3: Version bump
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.11.3.ebuild | 85
2 files changed, 86 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 9c98fa4972f..04ce369b610 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,3 +2,4 @@ DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e
DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B
d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5
SHA512
361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250dff3
DIST bpftrace-0.11.2.tar.gz 867724 BLAKE2B
6d0a10c8a4261277fc3a6e5f422e26238673dcd76abcae6bd8079cc98ee713d3d34d3e09284f5c79ba323d7203d6d944999da17f73ab2afbf1d403cb0dd1a392
SHA512
25bcc9863d24646108252f0010b96afb823eb795c8c6d94112b7804740d7688139ead7d862a205a1b44b86ef135b412e533fc119939ce550e5509b1bd37952fa
+DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B
950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e
SHA512
76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
diff --git a/dev-util/bpftrace/bpftrace-0.11.3.ebuild
b/dev-util/bpftrace/bpftrace-0.11.3.ebuild
new file mode 100644
index 000..2a14dc58476
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+ dev-util/systemtap
+ =sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-12:=
+ >=dev-util/bcc-0.13.0:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+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"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: cd4b4f37eafc00df6b82a5623d6c9571fddcdce0
Author: Patrick McLean sony com>
AuthorDate: Fri Oct 30 21:12:50 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Oct 30 21:13:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4b4f37
dev-util/bpftrace-0.11.2: Version bump (fixes #749561)
Closes: https://bugs.gentoo.org/749561
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.11.2.ebuild | 86
2 files changed, 87 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index dfcb4d56f4d..9c98fa4972f 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,4 @@
DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B
d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5
SHA512
361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250dff3
+DIST bpftrace-0.11.2.tar.gz 867724 BLAKE2B
6d0a10c8a4261277fc3a6e5f422e26238673dcd76abcae6bd8079cc98ee713d3d34d3e09284f5c79ba323d7203d6d944999da17f73ab2afbf1d403cb0dd1a392
SHA512
25bcc9863d24646108252f0010b96afb823eb795c8c6d94112b7804740d7688139ead7d862a205a1b44b86ef135b412e533fc119939ce550e5509b1bd37952fa
diff --git a/dev-util/bpftrace/bpftrace-0.11.2.ebuild
b/dev-util/bpftrace/bpftrace-0.11.2.ebuild
new file mode 100644
index 000..263e993188e
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+ dev-util/systemtap
+ =sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+ <=sys-devel/clang-12:=
+ >=dev-util/bcc-0.13.0:=
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: c53e95fece1531c9bd7cb4589fa6a9e667126e28
Author: Patrick McLean sony com>
AuthorDate: Tue Sep 22 19:24:26 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Sep 22 19:24:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53e95fe
dev-util/bpftrace-0.11.1: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.11.1.ebuild | 85
2 files changed, 86 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 05368aaf51b..dfcb4d56f4d 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
+DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B
d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5
SHA512
361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250dff3
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild
b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
new file mode 100644
index 000..6eeeb6c28d6
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+ dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ sys-devel/clang:=
+ >=dev-util/bcc-0.13.0:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+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"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: 8937d76b9fb2e0fefac53f1c816c9a7cb883b81a
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Aug 30 11:05:03 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Aug 31 18:33:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8937d76b
dev-util/bpftrace: remove unused patch
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17328
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/files/bpftrace-mandir.patch | 22 --
1 file changed, 22 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-mandir.patch
b/dev-util/bpftrace/files/bpftrace-mandir.patch
deleted file mode 100644
index d18c1e2f321..000
--- a/dev-util/bpftrace/files/bpftrace-mandir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
-index 45cfe5d..d13229e 100644
a/man/man8/CMakeLists.txt
-+++ b/man/man8/CMakeLists.txt
-@@ -1,12 +1,12 @@
--find_program(GZIP gzip)
-+find_program(CAT cat)
- file(GLOB FILES *.8)
- set(GZFILES "")
- foreach(FIL ${FILES})
- get_filename_component(NAME ${FIL} NAME)
-- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
-+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
-+COMMAND ${CAT} ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
- DEPENDS ${FIL})
-- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
-+ list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
- endforeach()
- add_custom_target(man ALL DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION man/man8)
-+install(FILES ${GZFILES} DESTINATION share/man/man8)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 48a84f7589ca2addf1774e0a0851eb53f8cf3b92
Author: Patrick McLean gentoo org>
AuthorDate: Tue Aug 25 00:17:06 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Aug 25 00:17:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a84f75
dev-util/bpftrace-0.11.0-r1: Revbump, add newer llvm (bug #735760)
Closes: https://bugs.gentoo.org/735760
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Patrick McLean gentoo.org>
.../bpftrace/{bpftrace-.ebuild => bpftrace-0.11.0-r1.ebuild} | 5 ++---
dev-util/bpftrace/bpftrace-.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
similarity index 93%
copy from dev-util/bpftrace/bpftrace-.ebuild
copy to dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
index eab73335433..6eeeb6c28d6 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
@@ -28,8 +28,7 @@ COMMON_DEPEND="
sys-devel/clang:=
dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- =dev-util/bcc-0.13.0:=
virtual/libelf
"
@@ -68,7 +67,7 @@ pkg_pretend() {
}
pkg_setup() {
- LLVM_MAX_SLOT=9 llvm_pkg_setup
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
}
src_prepare() {
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index eab73335433..6eeeb6c28d6 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -28,8 +28,7 @@ COMMON_DEPEND="
sys-devel/clang:=
dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- =dev-util/bcc-0.13.0:=
virtual/libelf
"
@@ -68,7 +67,7 @@ pkg_pretend() {
}
pkg_setup() {
- LLVM_MAX_SLOT=9 llvm_pkg_setup
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
}
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: d462006c30f8bcaa267ad7acff1692e88128429c
Author: Patrick McLean gentoo org>
AuthorDate: Tue Aug 25 00:18:56 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Aug 25 00:18:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d462006c
dev-util/bpftrace: Remove old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 3 -
dev-util/bpftrace/bpftrace-0.11.0.ebuild | 86
dev-util/bpftrace/bpftrace-0.9.2.ebuild| 68 --
dev-util/bpftrace/bpftrace-0.9.3.ebuild| 68 --
dev-util/bpftrace/bpftrace-0.9.4.ebuild| 76 ---
.../bpftrace-0.10_pre20190614-install-libs.patch | 115
.../files/bpftrace-0.9.3-install-libs.patch| 129 --
.../files/bpftrace-0.9.4-install-libs.patch| 141
.../bpftrace/files/bpftrace-0.9.4-llvm-10.patch| 144 -
9 files changed, 830 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 76af8334ccf..05368aaf51b 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,5 +1,2 @@
DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
-DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
-DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
-DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B
d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5
SHA512
d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
diff --git a/dev-util/bpftrace/bpftrace-0.11.0.ebuild
b/dev-util/bpftrace/bpftrace-0.11.0.ebuild
deleted file mode 100644
index eab73335433..000
--- a/dev-util/bpftrace/bpftrace-0.11.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
- dev-util/systemtap
- sys-devel/clang:=
- dev-libs/libbpf:=
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- =dev-util/bcc-0.13.0:=
- virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
- >=dev-util/cmake-3.8
- sys-devel/flex
- sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-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"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="
- ~BPF
- ~BPF_EVENTS
- ~BPF_JIT
- ~BPF_SYSCALL
- ~FTRACE_SYSCALLS
- ~HAVE_EBPF_JIT
- "
-
- check_extra_config
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs
- mycmakeargs=(
- "-DSTATIC_LINKING:BOOL=OFF"
- "-DBUILD_TESTING:BOOL=OFF"
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 7b55743aa30fdbdbdfdc15d10465a5d3384917cf
Author: Patrick McLean gentoo org>
AuthorDate: Wed Jul 15 19:08:38 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Jul 15 19:09:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b55743a
dev-util/bpftrace-0.11.0: Version bump, sync
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
...bpftrace-.ebuild => bpftrace-0.11.0.ebuild} | 48 +--
dev-util/bpftrace/bpftrace-.ebuild | 48 +--
.../files/bpftrace-0.11.0-install-libs.patch | 156 +
4 files changed, 225 insertions(+), 28 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 44a6444f74b..76af8334ccf 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1,5 @@
DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
+DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B
a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7
SHA512
32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B
d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5
SHA512
d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-0.11.0.ebuild
similarity index 52%
copy from dev-util/bpftrace/bpftrace-.ebuild
copy to dev-util/bpftrace/bpftrace-0.11.0.ebuild
index ccad41e9941..eab73335433 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs linux-info cmake-utils
+inherit toolchain-funcs llvm linux-info cmake
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
@@ -13,7 +13,8 @@ if [[ ${PV} =~ 9{4,} ]]; then
EGIT_REPO_URI="https://github.com/iovisor/${PN}";
BDEPEND=""
else
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="app-arch/xz-utils "
fi
@@ -22,37 +23,56 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
-COMMON_DEPEND="dev-util/systemtap
+COMMON_DEPEND="
+ dev-util/systemtap
sys-devel/clang:=
dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- >=dev-util/bcc-0.10.0:=
- virtual/libelf"
+ =dev-util/bcc-0.13.0:=
+ virtual/libelf
+"
DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )"
+ test? ( dev-cpp/gtest )
+"
RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
+BDEPEND+="
+ >=dev-util/cmake-3.8
sys-devel/flex
- sys-devel/bison"
+ sys-devel/bison
+"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
- "${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
- "${FILESDIR}/bpftrace-mandir.patch"
+ "${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
)
# lots of fixing needed
RESTRICT="test"
pkg_pretend() {
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
check_extra_config
}
+pkg_setup() {
+ LLVM_MAX_SL
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 9071888928b0b9d61e061fea79e4bd8f60eeab01
Author: Patrick McLean gentoo org>
AuthorDate: Sat Jun 20 19:21:58 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Jun 20 19:21:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90718889
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 gentoo.org>
dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild | 2 ++
.../files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch | 13 +
2 files changed, 15 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
index 196615ab2a9..26c1753afef 100644
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
@@ -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
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
new file mode 100644
index 000..145fb1c0ca9
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
@@ -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)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 0c58230e0fc74178013f49bf1adc9f856e9ea247
Author: Patrick McLean sony com>
AuthorDate: Thu May 28 20:26:30 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu May 28 20:26:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c58230e
dev-util/bpftrace-0.10.0-r1: Bump, patch llvm-10 segfault (bug #724382)
Closes: https://bugs.gentoo.org/724382
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
...ace-0.10.0.ebuild => bpftrace-0.10.0-r1.ebuild} | 3 ++
.../files/bpftrace-0.10.0-llvm-multi.patch | 60 ++
2 files changed, 63 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.10.0.ebuild
b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
similarity index 92%
rename from dev-util/bpftrace/bpftrace-0.10.0.ebuild
rename to dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
index 3070afa1505..196615ab2a9 100644
--- a/dev-util/bpftrace/bpftrace-0.10.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
@@ -27,6 +27,8 @@ COMMON_DEPEND="dev-util/systemtap
sys-devel/clang:=
dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ =dev-util/bcc-0.12.0:=
virtual/libelf"
DEPEND="${COMMON_DEPEND}
@@ -42,6 +44,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
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"
)
# lots of fixing needed
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
new file mode 100644
index 000..48eeeb8e200
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
@@ -0,0 +1,60 @@
+diff -ru a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-05-20 21:00:22.789744736 -0500
b/CMakeLists.txt 2020-05-20 18:52:38.241091110 -0500
+@@ -30,6 +30,11 @@
+ elseif(STATIC_LIBC)
+ message(WARNING "static libc is known to cause problems, consider
STATIC_LIBC=OFF. Proceed at your own risk") #iovisor/bpftrace/issues/266
+ endif()
++else()
++ find_package(LLVM 9 REQUIRED CONFIG)
++
++ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
++ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+ endif()
+
+ if(EMBED_LIBCLANG_ONLY AND NOT EMBED_CLANG)
+diff -ru a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+--- a/src/ast/CMakeLists.txt 2020-05-20 21:00:22.44534 -0500
b/src/ast/CMakeLists.txt 2020-05-20 20:52:39.657888690 -0500
+@@ -42,26 +41,29 @@
+ if(EMBED_LIBCLANG_ONLY)
+ unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
+ endif()
+-target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
++target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
+ else()
+ list(INSERT clang_libs 0 libclang.a)
+ endif()
+
+ if(EMBED_LLVM)
+-target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
++target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
+ else()
+ llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit
orcjit ${LLVM_TARGETS_TO_BUILD})
+-target_link_libraries(bpftraceast ${clang_libs})
+-target_link_libraries(bpftraceast ${llvm_libs})
++target_link_libraries(bpftraceast ${clang_libs})
++target_link_libraries(bpftraceast ${llvm_libs})
+ endif()
+ else()
+- find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
+- if(found_LLVM)
+-target_link_libraries(bpftraceast LLVM)
+- else()
+-llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit
orcjit ${LLVM_TARGETS_TO_BUILD})
+-llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+-target_link_libraries(bpftraceast ${llvm_libs})
++ find_package(LLVM 9 REQUIRED CONFIG)
++
++ include_directories(${LLVM_INCLUDE_DIRS})
++ add_definitions(${LLVM_DEFINITIONS})
++
++ find_library(found_clang clang HINTS ${LLVM_LIBRARY_DIRS})
++ if(found_clang)
++target_link_libraries(bpftraceast ${found_clang})
+ endif()
+- target_link_libraries(bpftraceast libclang)
++ llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit
orcjit ${LLVM_TARGETS_TO_BUILD})
++ llvm_expand_dependencies(llvm_libs ${_llvm_libs})
++ target_link_libraries(bpftraceast ${llvm_libs})
+ endif()
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 0c4e0935e4b4dfda5ed69460a0b6812bd91e8216
Author: Patrick McLean sony com>
AuthorDate: Mon Apr 13 23:14:40 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Apr 14 01:23:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4e0935
dev-util/bpftrace-0.10.0: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.10.0.ebuild | 75 +++
.../files/bpftrace-0.10.0-dont-compress-man.patch | 18 +++
.../files/bpftrace-0.10.0-install-libs.patch | 148 +
4 files changed, 242 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 2414ad795d3..44a6444f74b 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,4 @@
+DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B
623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212
SHA512
da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B
d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5
SHA512
d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
diff --git a/dev-util/bpftrace/bpftrace-0.10.0.ebuild
b/dev-util/bpftrace/bpftrace-0.10.0.ebuild
new file mode 100644
index 000..3070afa1505
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.10.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.12.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
new file mode 100644
index 000..750ed4f712a
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
@@ -0,0 +1,18 @@
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index f1fc334..7ee58ed 100644
+--- a/man/man8/CMakeLists.txt
b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+- get_filename_component(NAME ${FIL} NAME)
+- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-DEP
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: a283a68e01eee195c32fb3fe69808ff5111ed6c5
Author: Patrick McLean gentoo org>
AuthorDate: Mon Mar 9 06:01:14 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Mon Mar 9 06:01:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a283a68e
dev-util/bpftrace-0.9.4: Fix build with llvm-10
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.9.4.ebuild| 1 +
.../bpftrace/files/bpftrace-0.9.4-llvm-10.patch| 144 +
2 files changed, 145 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
index 0afc8a9890f..ad25d1221e1 100644
--- a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
+ "${FILESDIR}/bpftrace-0.9.4-llvm-10.patch"
"${FILESDIR}/bpftrace-0.9.4-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
)
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
new file mode 100644
index 000..c2131cbbc30
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
@@ -0,0 +1,144 @@
+diff --git a/src/ast/codegen_llvm.cpp b/src/ast/codegen_llvm.cpp
+index f81906c..bcc2c7d 100644
+--- a/src/ast/codegen_llvm.cpp
b/src/ast/codegen_llvm.cpp
+@@ -41,7 +41,7 @@ void CodegenLLVM::visit(PositionalParameter ¶m)
+ {
+ Constant *const_str =
ConstantDataArray::getString(module_->getContext(), pstr, true);
+ AllocaInst *buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(),
pstr.length() + 1), "str");
+- b_.CreateMemSet(buf, b_.getInt8(0), pstr.length() + 1, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), pstr.length() + 1, 1);
+ b_.CreateStore(const_str, buf);
+ expr_ = buf;
+ }
+@@ -156,7 +156,7 @@ void CodegenLLVM::visit(Builtin &builtin)
+ {
+ AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "comm");
+ // initializing memory needed for older kernels:
+-b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
++b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
+ b_.CreateGetCurrentComm(buf, builtin.type.size);
+ expr_ = buf;
+ }
+@@ -189,7 +189,7 @@ void CodegenLLVM::visit(Builtin &builtin)
+ if (builtin.type.type == Type::usym)
+ {
+ AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "func");
+- b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
++ b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
+ Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
+ Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
+ Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
+@@ -444,7 +444,7 @@ void CodegenLLVM::visit(Call &call)
+ else if (call.func == "str")
+ {
+ AllocaInst *strlen = b_.CreateAllocaBPF(b_.getInt64Ty(), "strlen");
+-b_.CreateMemSet(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
++b_.CREATE_MEMSET(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
+ if (call.vargs->size() > 1) {
+ call.vargs->at(1)->accept(*this);
+ Value *proposed_strlen = b_.CreateAdd(expr_, b_.getInt64(1)); // add 1
to accommodate probe_read_str's null byte
+@@ -462,7 +462,7 @@ void CodegenLLVM::visit(Call &call)
+ b_.CreateStore(b_.getInt64(bpftrace_.strlen_), strlen);
+ }
+ AllocaInst *buf = b_.CreateAllocaBPF(bpftrace_.strlen_, "str");
+-b_.CreateMemSet(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
++b_.CREATE_MEMSET(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
+ call.vargs->front()->accept(*this);
+ b_.CreateProbeReadStr(buf, b_.CreateLoad(strlen), expr_);
+ b_.CreateLifetimeEnd(strlen);
+@@ -541,7 +541,7 @@ void CodegenLLVM::visit(Call &call)
+ {
+ // store uint64_t[2] with: [0]: (uint64_t)addr, [1]: (uint64_t)pid
+ AllocaInst *buf = b_.CreateAllocaBPF(call.type, "usym");
+-b_.CreateMemSet(buf, b_.getInt8(0), call.type.size, 1);
++b_.CREATE_MEMSET(buf, b_.getInt8(0), call.type.size, 1);
+ Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
+ Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
+ Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
+@@ -592,7 +592,7 @@ void CodegenLLVM::visit(Call &call)
+ b_.CreateStore(af_type, af_offset);
+
+ Value *inet_offset = b_.CreateGEP(buf, {b_.getInt32(0), b_.getInt32(1)});
+-b_.CreateMemSet(inet_offset, b_.getInt8(0), 16, 1);
++b_.CREATE_MEMSET(inet_offset, b_.getInt8(0), 16, 1);
+
+ inet->accept(*this);
+ if (inet->type.type == Type::array)
+@@ -663,7 +663,7 @@ void CodegenLLVM::visit(Call &call)
+ auto &map = static_cast(arg);
+ Constant *const_str = ConstantDataArray::getString(modu
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 6869606d41d3d576f5226df752a3a5ea9b997677
Author: Patrick McLean sony com>
AuthorDate: Tue Feb 4 21:19:12 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Feb 4 21:19:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6869606d
dev-util/bpftrace-0.9.4: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.9.4.ebuild| 75 +++
.../files/bpftrace-0.9.4-install-libs.patch| 141 +
3 files changed, 217 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f81c8a38367..2414ad795d3 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
+DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B
d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5
SHA512
d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
diff --git a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
new file mode 100644
index 000..0afc8a9890f
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.12.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.9.4-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
new file mode 100644
index 000..fe3fc29fd9b
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
@@ -0,0 +1,141 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b214c1..a787d7d 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -85,9 +85,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIB
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 40e25a062ce4caa651d87a321d00b72f9e406d7e
Author: Patrick McLean sony com>
AuthorDate: Thu Nov 21 18:27:23 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Nov 21 18:27:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e25a06
dev-util/bpftrace: Version bump to 0.9.3
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
...{bpftrace-.ebuild => bpftrace-0.9.3.ebuild} | 6 +-
dev-util/bpftrace/bpftrace-.ebuild | 2 +-
.../files/bpftrace-0.9.3-install-libs.patch| 129 +
4 files changed, 135 insertions(+), 3 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 8781df460c0..2b07beb3911 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,4 @@
DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B
03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46
SHA512
e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
+DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
similarity index 86%
copy from dev-util/bpftrace/bpftrace-.ebuild
copy to dev-util/bpftrace/bpftrace-0.9.3.ebuild
index 659b5f9766a..74f1dd849d2 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
@@ -13,7 +13,8 @@ if [[ ${PV} =~ 9{4,} ]]; then
EGIT_REPO_URI="https://github.com/iovisor/${PN}";
BDEPEND=""
else
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="app-arch/xz-utils "
fi
@@ -35,10 +36,11 @@ BDEPEND+="dev-util/cmake
sys-devel/flex
sys-devel/bison"
+S="${WORKDIR}/${PN}-${MY_PV}"
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
- "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
)
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 659b5f9766a..ccad41e9941 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -38,7 +38,7 @@ BDEPEND+="dev-util/cmake
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
- "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
)
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
new file mode 100644
index 000..0ddb07b4740
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
@@ -0,0 +1,129 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e0d770..d51edf6 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -51,9 +51,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 924df95fef37df58ebba2b4a162a66c5408dcfe9
Author: Patrick McLean sony com>
AuthorDate: Thu Nov 21 18:29:20 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Nov 21 18:29:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924df95f
dev-util/bpftrace: remove old
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 2 -
dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 66
dev-util/bpftrace/bpftrace-0.9.1.ebuild| 68 -
dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch | 30 --
.../bpftrace-0.9_pre20190311-install-libs.patch| 111 -
5 files changed, 277 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 2b07beb3911..f81c8a38367 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1,2 @@
-DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B
03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46
SHA512
e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B
d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232
SHA512
49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
-DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
deleted file mode 100644
index 74351e85e8c..000
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="sys-devel/clang:=
- dev-libs/libbpf:=
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- >=dev-util/bcc-0.9.0:=
- virtual/libelf"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
- sys-devel/flex
- sys-devel/bison"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
- "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
- "${FILESDIR}/bpftrace-mandir.patch"
- "${FILESDIR}/bpftrace-0.9-llvm-8.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
-
- check_extra_config
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs
- mycmakeargs=(
- "-DSTATIC_LINKING:BOOL=OFF"
- "-DBUILD_TESTING:BOOL=OFF"
- )
-
- cmake-utils_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.9.1.ebuild
b/dev-util/bpftrace/bpftrace-0.9.1.ebuild
deleted file mode 100644
index 5fcb41040f5..000
--- a/dev-util/bpftrace/bpftrace-0.9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- MY_PV="${PV//_/}"
- SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMO
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 7c21975080cfcfdcd5c26bbf616016ba1a7c9ef1
Author: Patrick McLean sony com>
AuthorDate: Wed Jul 31 23:18:01 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Jul 31 23:18:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c219750
dev-util/bpftrace: Version bump to 0.9.2
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.9.2.ebuild | 68 +
2 files changed, 69 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index a8609c80203..8781df460c0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B
03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46
SHA512
e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
+DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B
1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3
SHA512
5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-0.9.2.ebuild
b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
new file mode 100644
index 000..5fcb41040f5
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.10.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 4c70cbbe8552ef62d37ad07644be0e93dceb9431
Author: Patrick McLean sony com>
AuthorDate: Tue Jun 25 18:05:36 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Jun 25 18:05:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c70cbbe
dev-util/bpftrace: Version bump to 0.9.1
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest| 2 +-
dev-util/bpftrace/{bpftrace-0.9.1_rc.ebuild => bpftrace-0.9.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 2654ec88e8f..a8609c80203 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,2 @@
-DIST bpftrace-0.9.1_rc.tar.gz 702496 BLAKE2B
9dba9d132e30626a2b79ef3c36cbf3813dd20b649a96613458116d9631d16bf743659221d0dc9b231a2904420ef06497bfeffd86c2db652d9d77b6096d71dd08
SHA512
b6c3cd161febde5a156c01ccb852a3f5ddf56b0bdaaa97846dcebc8e573b6bba3ebe20c13dadb05047c9be7441d7b5915e72f4acf8fdf6f7afc40fcbd2facbb1
+DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B
03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46
SHA512
e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild
b/dev-util/bpftrace/bpftrace-0.9.1.ebuild
similarity index 100%
rename from dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild
rename to dev-util/bpftrace/bpftrace-0.9.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 6ee30dfa96c2e776787f73c7eb775156f07b2341
Author: Patrick McLean sony com>
AuthorDate: Thu Jun 20 18:25:01 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Jun 20 18:25:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee30dfa
dev-util/bpftrace: Version bump to 0.9.1_rc
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild | 68 ++
2 files changed, 69 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 248bc7a1482..2654ec88e8f 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
+DIST bpftrace-0.9.1_rc.tar.gz 702496 BLAKE2B
9dba9d132e30626a2b79ef3c36cbf3813dd20b649a96613458116d9631d16bf743659221d0dc9b231a2904420ef06497bfeffd86c2db652d9d77b6096d71dd08
SHA512
b6c3cd161febde5a156c01ccb852a3f5ddf56b0bdaaa97846dcebc8e573b6bba3ebe20c13dadb05047c9be7441d7b5915e72f4acf8fdf6f7afc40fcbd2facbb1
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild
b/dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild
new file mode 100644
index 000..5fcb41040f5
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.1_rc.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.10.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/
commit: 4755d09cbd780ec84807b1190364591c76988de5
Author: Patrick McLean sony com>
AuthorDate: Fri Jun 14 21:03:02 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jun 14 21:03:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4755d09c
dev-util/bpftrace: Update live ebuild to work with current git
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-.ebuild | 8 +-
.../bpftrace-0.10_pre20190614-install-libs.patch | 115 +
2 files changed, 119 insertions(+), 4 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 74351e85e8c..659b5f9766a 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -22,10 +22,11 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
-COMMON_DEPEND="sys-devel/clang:=
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- >=dev-util/bcc-0.9.0:=
+ >=dev-util/bcc-0.10.0:=
virtual/libelf"
DEPEND="${COMMON_DEPEND}
test? ( dev-cpp/gtest )"
@@ -37,9 +38,8 @@ BDEPEND+="dev-util/cmake
QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
- "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
- "${FILESDIR}/bpftrace-0.9-llvm-8.patch"
)
# lots of fixing needed
diff --git
a/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch
b/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch
new file mode 100644
index 000..f4483570c99
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch
@@ -0,0 +1,115 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e8870c6..a55385d 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -47,9 +47,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc
VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS}
${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast
${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ include(CheckSymbolExists)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index b8b0d96..0803c1e 100644
+--- a/resources/CMakeLists.txt
b/resources/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-add_library(resources headers.cpp)
++add_library(bpftraceresources headers.cpp)
+
+-target_include_directories(resources PUBLIC ../src)
++target_include_directories(bpftraceresources PUBLIC ../src)
++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ function(embed_headers output)
+ file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e737119..b2b17e2 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -30,7 +30,8 @@ endif(HAVE_BCC_ELF_FOREACH_SYM)
+ if(HAVE_GET_CURRENT_CGROUP_ID)
+ target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
+ endif(HAVE_GET_CURRENT_CGROUP_ID)
+-target_link_libraries(bpftrace arch ast parser resources)
++target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
++ bpftraceresources)
+
+ if (STATIC_LINKING)
+ target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index a26f610..53627e2 100644
+--- a/src/arch/CMakeLists.txt
b/src/arch/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-add_library(arch aarch64.cpp)
++add_library(bpftracearch aarch64.cpp)
+ else()
+-add_library(arch x86_64.cpp)
++add_library(bpftracearch x86_64.cpp)
+ endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 4d77c9f..2a00572 100644
+--- a/src/ast/CMakeLists.txt
b/src/ast/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(ast
++add_library(bpftraceast
+ ast.cpp
+ codegen_llvm.cpp
+ irbuilderbpf.cpp
+@@ -7,15 +7,16 @@ add_library(ast
+ )
+
+ if(HAVE_GET_CURRENT_CGROUP_ID)
+- target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
++ target_compile_de
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: f65bc1fdc314f3c6f9f0ad5311989823bd092686
Author: Stephen Klimaszewski gentoo org>
AuthorDate: Tue May 21 16:45:06 2019 +
Commit: Stephen Klimaszewski gentoo org>
CommitDate: Tue May 21 16:45:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65bc1fd
dev-util/bpftrace: add ~arm64 keywording
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Stephen Klimaszewski gentoo.org>
dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 2 +-
dev-util/bpftrace/bpftrace-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 81d37ad3721..74351e85e8c 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
BDEPEND=""
else
SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="app-arch/xz-utils "
fi
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 81d37ad3721..74351e85e8c 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
BDEPEND=""
else
SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="app-arch/xz-utils "
fi
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 88f8ba1414969e63a37dd9417125439d515bcd35
Author: Patrick McLean gentoo org>
AuthorDate: Fri Apr 12 04:31:34 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Apr 12 04:31:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f8ba14
dev-util/bpftrace: remove check for EBPF_JIT since it can't be set
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 2 +-
dev-util/bpftrace/bpftrace-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 68c9292ad9c..81d37ad3721 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -46,7 +46,7 @@ PATCHES=(
RESTRICT="test"
pkg_pretend() {
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~EBPF_JIT BPF_EVENTS"
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
check_extra_config
}
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 68c9292ad9c..81d37ad3721 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -46,7 +46,7 @@ PATCHES=(
RESTRICT="test"
pkg_pretend() {
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~EBPF_JIT BPF_EVENTS"
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
check_extra_config
}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 30a2bbeeff8a3ef3d4b21014f5f8b9aa6bf7e4c7
Author: Patrick McLean gentoo org>
AuthorDate: Fri Apr 12 04:28:01 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Apr 12 04:28:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a2bbee
dev-util/bpftrace: Check kernel configuration
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 8 +++-
dev-util/bpftrace/bpftrace-.ebuild | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 393a086df3b..68c9292ad9c 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs cmake-utils
+inherit toolchain-funcs linux-info cmake-utils
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
@@ -45,6 +45,12 @@ PATCHES=(
# lots of fixing needed
RESTRICT="test"
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~EBPF_JIT BPF_EVENTS"
+
+ check_extra_config
+}
+
src_prepare() {
cmake-utils_src_prepare
}
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 393a086df3b..68c9292ad9c 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs cmake-utils
+inherit toolchain-funcs linux-info cmake-utils
DESCRIPTION="High-level tracing language for eBPF"
HOMEPAGE="https://github.com/iovisor/bpftrace";
@@ -45,6 +45,12 @@ PATCHES=(
# lots of fixing needed
RESTRICT="test"
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~EBPF_JIT BPF_EVENTS"
+
+ check_extra_config
+}
+
src_prepare() {
cmake-utils_src_prepare
}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 6753044381430a4c72c027570fe2b8943424a6f8
Author: Patrick McLean sony com>
AuthorDate: Fri Apr 5 18:02:28 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Apr 5 18:03:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67530443
dev-util/bpftrace: Revbump, add dep on libbpf, sync live
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/{bpftrace-0.9.ebuild => bpftrace-0.9-r1.ebuild} | 1 +
dev-util/bpftrace/bpftrace-.ebuild| 8 +---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild
b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
similarity index 98%
rename from dev-util/bpftrace/bpftrace-0.9.ebuild
rename to dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 1f481b0f3e2..393a086df3b 100644
--- a/dev-util/bpftrace/bpftrace-0.9.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
IUSE="test"
COMMON_DEPEND="sys-devel/clang:=
+ dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
>=dev-util/bcc-0.9.0:=
virtual/libelf"
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
index 1f874815e93..393a086df3b 100644
--- a/dev-util/bpftrace/bpftrace-.ebuild
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -13,8 +13,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
EGIT_REPO_URI="https://github.com/iovisor/${PN}";
BDEPEND=""
else
- SRC_URI="mirror://gentoo/${P}.tar.xz"
- #SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
BDEPEND="app-arch/xz-utils "
fi
@@ -24,6 +23,7 @@ SLOT="0"
IUSE="test"
COMMON_DEPEND="sys-devel/clang:=
+ dev-libs/libbpf:=
>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
>=dev-util/bcc-0.9.0:=
virtual/libelf"
@@ -34,10 +34,12 @@ BDEPEND+="dev-util/cmake
sys-devel/flex
sys-devel/bison"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
PATCHES=(
- "${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
+ "${FILESDIR}/bpftrace-0.9-llvm-8.patch"
)
# lots of fixing needed
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 57cdeba2f33699aa5b5914165130776d8230b71f
Author: Patrick McLean sony com>
AuthorDate: Wed Mar 20 21:27:23 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Mar 20 21:27:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cdeba2
dev-util/bpftrace: Fix compilation with llvm-8 in 0.9
Patch taken from upstream PR:
https://github.com/iovisor/bpftrace/pull/210
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/bpftrace-0.9.ebuild | 1 +
dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch | 30 +++
2 files changed, 31 insertions(+)
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild
b/dev-util/bpftrace/bpftrace-0.9.ebuild
index b483aed0116..1f481b0f3e2 100644
--- a/dev-util/bpftrace/bpftrace-0.9.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.ebuild
@@ -38,6 +38,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
PATCHES=(
"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
"${FILESDIR}/bpftrace-mandir.patch"
+ "${FILESDIR}/bpftrace-0.9-llvm-8.patch"
)
# lots of fixing needed
diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
new file mode 100644
index 000..14d6a167a86
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
@@ -0,0 +1,30 @@
+diff --git a/src/bpforc.h b/src/bpforc.h
+index a6ee583..8d0e579 100644
+--- a/src/bpforc.h
b/src/bpforc.h
+@@ -80,8 +80,13 @@ class BpfOrc
+ ExecutionSession ES;
+ std::unique_ptr TM;
+ std::shared_ptr Resolver;
++#if LLVM_VERSION_MAJOR >= 8
++ LegacyRTDyldObjectLinkingLayer ObjectLayer;
++ LegacyIRCompileLayer CompileLayer;
++#else
+ RTDyldObjectLinkingLayer ObjectLayer;
+ IRCompileLayer CompileLayer;
++#endif
+
+ public:
+ std::map> sections_;
+@@ -91,7 +96,11 @@ class BpfOrc
+ Resolver(createLegacyLookupResolver(ES,
+ [](const std::string &Name __attribute__((unused))) -> JITSymbol {
return nullptr; },
+ [](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
++#if LLVM_VERSION_MAJOR >= 8
++ ObjectLayer(ES, [this](VModuleKey) { return
LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared(sections_),
Resolver}; }),
++#else
+ ObjectLayer(ES, [this](VModuleKey) { return
RTDyldObjectLinkingLayer::Resources{std::make_shared(sections_),
Resolver}; }),
++#endif
+ CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}
+
+ void compileModule(std::unique_ptr M) {
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
commit: dda29bd566122dfec38506c07e35a6d5f527f76c
Author: Patrick McLean gentoo org>
AuthorDate: Sat Mar 16 20:48:28 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Mar 16 20:48:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda29bd5
dev-util/bpftrace: Remove unused patch
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
.../bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch | 13 -
1 file changed, 13 deletions(-)
diff --git a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch
b/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch
deleted file mode 100644
index 0f3706fadf5..000
--- a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index d7905cd..adbd40c 100644
a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -376,7 +376,7 @@ void AttachedProbe::load_prog()
- void AttachedProbe::attach_kprobe()
- {
- int perf_event_fd = bpf_attach_kprobe(progfd_, attachtype(probe_.type),
-- eventname().c_str(), probe_.attach_point.c_str(), 0);
-+ eventname().c_str(), probe_.attach_point.c_str(), 0, -1);
-
- if (perf_event_fd < 0) {
- if (probe_.orig_name != probe_.name) {
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 5ac6ea3ca48ee6c8ffaf2c1f105a88f6ed67bcea
Author: Patrick McLean gentoo org>
AuthorDate: Sat Mar 16 20:43:28 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Mar 16 20:43:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac6ea3c
dev-util/bpftrace: Remove 0.9 prerelease
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest| 1 -
dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild | 58 ---
2 files changed, 59 deletions(-)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index aaf4c81b756..248bc7a1482 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1 @@
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-DIST bpftrace-0.9_pre20190311.tar.xz 613856 BLAKE2B
7f670647305e61d9a11a87be44bc2228fee6b474bd920b460ecd6375f23d371e2cc8b0bb22eb4473807b92fc44c4f13eb3be72d048f75f3f59e814c201eddba6
SHA512
7091b16ef1dafdc75dd8e6f172da68ea31d0a89ad42192dc86ced6d22a3c200a385a3e63f5a829cfad42ee5ba44e806b50ac450d17a96ef438ed5668d5b0c55f
diff --git a/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
b/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
deleted file mode 100644
index 1f874815e93..000
--- a/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace";
-
-if [[ ${PV} =~ 9{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iovisor/${PN}";
- BDEPEND=""
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz"
- #SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="sys-devel/clang:=
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
- >=dev-util/bcc-0.9.0:=
- virtual/libelf"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
- sys-devel/flex
- sys-devel/bison"
-
-PATCHES=(
- "${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
- "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
- "${FILESDIR}/bpftrace-mandir.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local -a mycmakeargs
- mycmakeargs=(
- "-DSTATIC_LINKING:BOOL=OFF"
- "-DBUILD_TESTING:BOOL=OFF"
- )
-
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/
commit: 81cce98c8c5f692334636d8f84e97f97f4d39dcc
Author: Patrick McLean gentoo org>
AuthorDate: Sat Mar 16 20:42:19 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Mar 16 20:42:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81cce98c
dev-util/bpftrace: Version bump to 0.9
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest| 1 +
dev-util/bpftrace/bpftrace-0.9.ebuild | 58 +++
2 files changed, 59 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index fbf71324c93..aaf4c81b756 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
+DIST bpftrace-0.9.tar.gz 668655 BLAKE2B
650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc
SHA512
771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
DIST bpftrace-0.9_pre20190311.tar.xz 613856 BLAKE2B
7f670647305e61d9a11a87be44bc2228fee6b474bd920b460ecd6375f23d371e2cc8b0bb22eb4473807b92fc44c4f13eb3be72d048f75f3f59e814c201eddba6
SHA512
7091b16ef1dafdc75dd8e6f172da68ea31d0a89ad42192dc86ced6d22a3c200a385a3e63f5a829cfad42ee5ba44e806b50ac450d17a96ef438ed5668d5b0c55f
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild
b/dev-util/bpftrace/bpftrace-0.9.ebuild
new file mode 100644
index 000..b483aed0116
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="sys-devel/clang:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.9.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
commit: 8ba9e3e616b62ef293d2223b347e2cea6e25b1eb
Author: Patrick McLean sony com>
AuthorDate: Tue Mar 12 02:15:59 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Mar 12 02:15:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba9e3e6
dev-util/bpftrace: New package
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean gentoo.org>
dev-util/bpftrace/Manifest | 1 +
dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild | 58 +++
dev-util/bpftrace/bpftrace-.ebuild | 58 +++
.../files/bpftrace-0.9_pre20190311-bcc-0.9.patch | 13 +++
.../bpftrace-0.9_pre20190311-install-libs.patch| 111 +
dev-util/bpftrace/files/bpftrace-mandir.patch | 22
dev-util/bpftrace/metadata.xml | 10 ++
7 files changed, 273 insertions(+)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
new file mode 100644
index 000..fbf71324c93
--- /dev/null
+++ b/dev-util/bpftrace/Manifest
@@ -0,0 +1 @@
+DIST bpftrace-0.9_pre20190311.tar.xz 613856 BLAKE2B
7f670647305e61d9a11a87be44bc2228fee6b474bd920b460ecd6375f23d371e2cc8b0bb22eb4473807b92fc44c4f13eb3be72d048f75f3f59e814c201eddba6
SHA512
7091b16ef1dafdc75dd8e6f172da68ea31d0a89ad42192dc86ced6d22a3c200a385a3e63f5a829cfad42ee5ba44e806b50ac450d17a96ef438ed5668d5b0c55f
diff --git a/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
b/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
new file mode 100644
index 000..1f874815e93
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9_pre20190311.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ #SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="sys-devel/clang:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.9.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
+ "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-util/bpftrace/bpftrace-.ebuild
b/dev-util/bpftrace/bpftrace-.ebuild
new file mode 100644
index 000..1f874815e93
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace";
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}";
+ BDEPEND=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ #SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="sys-devel/clang:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.9.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
+ "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch
b/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-bcc-0.9.patch
new file mode
