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

[Patrick McLean]

commit:     935ed96e4e87c521f1204bea27629d045e3e66bf
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  2 18:02:04 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Dec  2 18:02:04 2021 +0000
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 <chutzpah <AT> 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..000000000000
--- 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..000000000000
--- 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/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
deleted file mode 100644
index fb75f9db1ba3..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-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_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 0361cdaa..f9c536a3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -49,6 +49,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)
-@@ -109,7 +110,7 @@ if(STATIC_LINKING)
- endif(STATIC_LINKING)
- 
- 
--target_link_libraries(libbpftrace parser resources ast arch)
-+target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceast bpftracearch)
- 
- 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..4ad0f626 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,17 @@
- 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()
-+
-+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
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   attachpoint_parser.cpp
-   codegen_llvm.cpp
-@@ -13,17 +13,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)
--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)
- 
- if (HAVE_BCC_KFUNC)
--  target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC)
- endif(HAVE_BCC_KFUNC)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -54,11 +55,11 @@ if (STATIC_LINKING)
- 
- 
-   if(EMBED_USE_LLVM)
--    target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
-+    target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
-   else()
-     llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names})
--    target_link_libraries(ast ${clang_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- 
-   if(STATIC_LIBC)
-@@ -68,11 +69,11 @@ if (STATIC_LINKING)
- else()
-   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
-   if(found_LLVM)
--    target_link_libraries(ast 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(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
--  target_link_libraries(ast libclang)
-+  target_link_libraries(bpftraceast libclang)
- endif()