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

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     47cec63186c43f6a15fa3ac2275c2f4135906821
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 29 08:59:05 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 17:33:08 2022 +0000
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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26137
Signed-off-by: Patrick McLean <chutzpah <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/iovisor/bpftrace/pull/2059
---- a/src/fuzz_main.cpp
-+++ b/src/fuzz_main.cpp
-@@ -17,12 +17,12 @@
- #include <unistd.h>
-
- #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"

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
deleted file mode 100644
index 2e2484a2efe1..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea334df0..53e4dc8e 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_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 47a050e2..1bbcf882 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(runtime
-   ${BFD_DISASM_SRC}
- )
- # Ensure flex+bison outputs are built first
--add_dependencies(runtime parser)
-+add_dependencies(runtime bpftraceparser)
- 
- add_library(libbpftrace
-   build_info.cpp
-@@ -57,6 +57,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,6 +110,7 @@ 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})
-+install(TARGETS runtime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS})
- 
- # Linking
-@@ -121,7 +123,8 @@ if(STATIC_LINKING)
- endif(STATIC_LINKING)
- 
- 
--target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm)
-+target_link_libraries(libbpftrace bpftraceparser bpftraceresources
-+  runtime aot bpftraceast bpftracearch cxxdemangler_llvm)
- 
- 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..22944ddc 100644
---- a/src/aot/CMakeLists.txt
-+++ b/src/aot/CMakeLists.txt
-@@ -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)
--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})
- 
- # Linking
-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 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_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)
- 
--target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS})
-+target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS})
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -55,11 +57,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)
-@@ -69,13 +71,13 @@ 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()
- 
- add_subdirectory(bpforc)
-diff --git a/src/ast/bpforc/CMakeLists.txt b/src/ast/bpforc/CMakeLists.txt
-index 3f6dbefa..8ccfbb2b 100644
---- a/src/ast/bpforc/CMakeLists.txt
-+++ b/src/ast/bpforc/CMakeLists.txt
-@@ -1 +1,2 @@
- add_library(bpforc bpforc.cpp)
-+install(TARGETS bpforc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt
-index 04cfcdd9..5677aa4b 100644
---- a/src/cxxdemangler/CMakeLists.txt
-+++ b/src/cxxdemangler/CMakeLists.txt
-@@ -1,2 +1,4 @@
- add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp)
- add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp)
-+install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})