* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2019-03-16 20:48 Patrick McLean
0 siblings, 0 replies; 9+ messages in thread
From: Patrick McLean @ 2019-03-16 20:48 UTC (permalink / raw
To: gentoo-commits
commit: dda29bd566122dfec38506c07e35a6d5f527f76c
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:48:28 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:48:44 2019 +0000
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 <chutzpah <AT> 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..00000000000
--- 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) {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2020-08-31 18:33 Patrick McLean
0 siblings, 0 replies; 9+ messages in thread
From: Patrick McLean @ 2020-08-31 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 8937d76b9fb2e0fefac53f1c816c9a7cb883b81a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 11:05:03 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 18:33:09 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17328
Signed-off-by: Patrick McLean <chutzpah <AT> 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..00000000000
--- 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)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2020-11-20 13:26 Aaron Bauman
0 siblings, 0 replies; 9+ messages in thread
From: Aaron Bauman @ 2020-11-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 040b2310a46fb3ce023e2eae0e35def8bd3523da
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 07:57:48 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:46 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18277
Signed-off-by: Aaron Bauman <bman <AT> 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..00000000000
--- 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 (STATIC_LINKING)
- if(EMBED_LIBCLANG_ONLY)
- unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
- endif()
-- target_link_libraries(ast ${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(ast ${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(ast ${clang_libs})
-- target_link_libraries(ast ${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(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()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 56bcb4a..3f874f8 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -93,7 +93,8 @@ if(HAVE_BFD_DISASM)
- endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-
--target_link_libraries(bpftrace_test arch ast parser resources)
-+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
-+ bpftraceresources)
-
- target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
- if (STATIC_LINKING)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2021-11-10 17:16 Jakov Smolić
0 siblings, 0 replies; 9+ messages in thread
From: Jakov Smolić @ 2021-11-10 17:16 UTC (permalink / raw
To: gentoo-commits
commit: c0524e3d31d3137106289f106c2747e1473b7d0f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 10 17:09:33 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 17:16:14 2021 +0000
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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22887
Signed-off-by: Jakov Smolić <jsmolic <AT> 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..00000000000
--- 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)
--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
-@@ -45,17 +46,17 @@ if (STATIC_LINKING)
- if(EMBED_LIBCLANG_ONLY)
- unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
- endif()
-- target_link_libraries(ast ${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(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+ target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
- else()
- llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD})
-- 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)
-@@ -64,11 +65,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()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 8d546f9a..105dcd11 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_compile_options("-Wno-undef")
-+gdd_compile_options("-Wno-undef")
- add_compile_options("-Wno-switch-default")
- add_compile_options("-Wno-switch-enum")
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2022-07-18 17:33 Patrick McLean
0 siblings, 0 replies; 9+ messages in thread
From: Patrick McLean @ 2022-07-18 17:33 UTC (permalink / raw
To: gentoo-commits
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})
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2022-09-27 21:44 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-09-27 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 66fccd2e23fc467a967da7de4e83232d5e753e0b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 21:42:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 21:42:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fccd2e
dev-util/bpftrace: drop empty patch
Signed-off-by: Sam James <sam <AT> 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..000000000000
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2023-01-30 21:54 Patrick McLean
0 siblings, 0 replies; 9+ messages in thread
From: Patrick McLean @ 2023-01-30 21:54 UTC (permalink / raw
To: gentoo-commits
commit: afe066b68f5ccdf61bba479d22669b66b40fb257
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 21:52:48 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 21:54:18 2023 +0000
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 <chutzpah <AT> 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 000000000000..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)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2023-02-08 18:34 Patrick McLean
0 siblings, 0 replies; 9+ messages in thread
From: Patrick McLean @ 2023-02-08 18:34 UTC (permalink / raw
To: gentoo-commits
commit: df9d6c8ee2036f04607f68ba6a50c0c134b5671a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 8 16:52:01 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 18:34:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9d6c8e
dev-util/bpftrace: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29486
Signed-off-by: Patrick McLean <chutzpah <AT> 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..000000000000
--- 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 <toppk@bllue.org>
-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(),
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/
@ 2023-12-28 1:03 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2023-12-28 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 4d5166d36b88075ad2f7442caff4733922f9ff58
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 26 09:45:42 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 01:03:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5166d3
dev-util/bpftrace: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34484
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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 bpftracearch cxxdemangler_llvm)
-
- if(LIBPCAP_FOUND)
- target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES})
-@@ -136,37 +138,38 @@ if(HAVE_BFD_DISASM)
- if(STATIC_LINKING)
- add_library(LIBBFD STATIC IMPORTED)
- set_property(TARGET LIBBFD PROPERTY IMPORTED_LOCATION ${LIBBFD_LIBRARIES})
-- target_link_libraries(runtime LIBBFD)
-+ target_link_libraries(bpftraceruntime LIBBFD)
- add_library(LIBOPCODES STATIC IMPORTED)
- set_property(TARGET LIBOPCODES PROPERTY IMPORTED_LOCATION ${LIBOPCODES_LIBRARIES})
-- target_link_libraries(runtime LIBOPCODES)
-+ target_link_libraries(bpftraceruntime LIBOPCODES)
- add_library(LIBIBERTY STATIC IMPORTED)
- set_property(TARGET LIBIBERTY PROPERTY IMPORTED_LOCATION ${LIBIBERTY_LIBRARIES})
-- target_link_libraries(runtime LIBIBERTY)
-+ target_link_libraries(bpftraceruntime LIBIBERTY)
- else()
-- target_link_libraries(runtime ${LIBBFD_LIBRARIES})
-- target_link_libraries(runtime ${LIBOPCODES_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBFD_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBOPCODES_LIBRARIES})
- endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-
- # Link to bcc libraries (without LLVM) if possible
- if(LIBBCC_BPF_CONTAINS_RUNTIME)
-- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES})
- else()
-- target_link_libraries(runtime ${LIBBCC_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_LIBRARIES})
- endif()
-
- if(STATIC_BPF_BCC)
- # These are not part of the static libbcc so have to be added separate
-- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES})
-- target_link_libraries(runtime ${LIBBPF_LIBRARIES})
-- target_link_libraries(runtime ${LIBBCC_LOADER_LIBRARY_STATIC})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_LOADER_LIBRARY_STATIC})
-
- add_library(LIBELF STATIC IMPORTED)
- set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBELF_LIBRARIES})
-- target_link_libraries(runtime LIBELF)
-+ set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBBPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime LIBELF)
- else()
-- target_link_libraries(runtime ${LIBELF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES})
- endif(STATIC_BPF_BCC)
-
- if (LIBDW_FOUND)
-@@ -195,16 +198,16 @@ if (LIBDW_FOUND)
-
- target_link_libraries(LIBDW INTERFACE ${LIBDW_LIBS})
-
-- target_link_libraries(runtime LIBDW)
-+ target_link_libraries(bpftraceruntime LIBDW)
- else()
-- target_link_libraries(runtime ${LIBDW_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBDW_LIBRARIES})
- endif()
- endif()
-
- # Support for std::filesystem
- # GCC version <9 and Clang (all versions) require -lstdc++fs
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9")
-- target_link_libraries(runtime "stdc++fs")
-+ target_link_libraries(bpftraceruntime "stdc++fs")
- target_link_libraries(libbpftrace "stdc++fs")
- endif()
-
-@@ -226,16 +229,16 @@ endif()
- if (STATIC_LINKING)
- if(ANDROID)
- target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
-- target_link_libraries(runtime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
- else()
- target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
- target_link_libraries(libbpftrace "-Wl,-Bstatic" "-lz")
-- target_link_libraries(runtime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
-- target_link_libraries(runtime "-Wl,-Bstatic" "-lz")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bstatic" "-lz")
- endif()
- elseif(STATIC_BPF_BCC)
- # partial static build, libbpf needs zlib, bcc needs liblzma
-- target_link_libraries(runtime "-lz" "-llzma")
-+ target_link_libraries(bpftraceruntime "-lz" "-llzma")
- endif()
-
- unset(MAIN_SRC)
-diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt
-index c776d204..41e84317 100644
---- a/src/aot/CMakeLists.txt
-+++ b/src/aot/CMakeLists.txt
-@@ -1,8 +1,9 @@
- add_library(aot aot.cpp)
--add_dependencies(aot parser)
-+add_dependencies(aot bpftraceparser)
- 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)
-@@ -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(bpftraceast
- async_event_types.cpp
- attachpoint_parser.cpp
- elf_parser.cpp
-@@ -21,11 +21,13 @@ add_library(ast
- target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src)
- target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
- target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast ast_defs arch parser)
-+target_link_libraries(bpftraceast ast_defs bpftracearch 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
-@@ -58,20 +60,20 @@ 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})
-
- if(TARGET libclang_static)
-- target_link_libraries(ast libclang_static)
-+ target_link_libraries(bpftraceast libclang_static)
- else()
- # old LLVM versions don't export libclang_static in ClangTargets.cmake; fall back to
- # libclang.a in that case
-- target_link_libraries(ast libclang.a)
-+ target_link_libraries(abpftracest libclang.a)
- endif()
-
-- target_link_libraries(ast ${clang_libs})
-- target_link_libraries(ast ${llvm_libs})
-+ target_link_libraries(abpftracest ${clang_libs})
-+ target_link_libraries(abpftracest ${llvm_libs})
- endif()
-
- if(STATIC_LIBC)
-@@ -81,11 +83,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()
-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})
diff --git a/dev-util/bpftrace/files/bpftrace-0.18.1-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.18.1-install-libs.patch
deleted file mode 100644
index 1a7cfe609ba1..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.18.1-install-libs.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f026f04..235e60a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,9 +138,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 0a7a6a09..00020fc9 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} ${ZLIB_LIBRARIES})
--target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm)
-+target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES} ${ZLIB_LIBRARIES})
-+target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceruntime aot bpftraceast bpftracearch cxxdemangler_llvm)
-
- if(LIBPCAP_FOUND)
- target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES})
-@@ -136,37 +138,38 @@ if(HAVE_BFD_DISASM)
- if(STATIC_LINKING)
- add_library(LIBBFD STATIC IMPORTED)
- set_property(TARGET LIBBFD PROPERTY IMPORTED_LOCATION ${LIBBFD_LIBRARIES})
-- target_link_libraries(runtime LIBBFD)
-+ target_link_libraries(bpftraceruntime LIBBFD)
- add_library(LIBOPCODES STATIC IMPORTED)
- set_property(TARGET LIBOPCODES PROPERTY IMPORTED_LOCATION ${LIBOPCODES_LIBRARIES})
-- target_link_libraries(runtime LIBOPCODES)
-+ target_link_libraries(bpftraceruntime LIBOPCODES)
- add_library(LIBIBERTY STATIC IMPORTED)
- set_property(TARGET LIBIBERTY PROPERTY IMPORTED_LOCATION ${LIBIBERTY_LIBRARIES})
-- target_link_libraries(runtime LIBIBERTY)
-+ target_link_libraries(bpftraceruntime LIBIBERTY)
- else()
-- target_link_libraries(runtime ${LIBBFD_LIBRARIES})
-- target_link_libraries(runtime ${LIBOPCODES_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBFD_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBOPCODES_LIBRARIES})
- endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-
- # Link to bcc libraries (without LLVM) if possible
- if(LIBBCC_BPF_CONTAINS_RUNTIME)
-- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES})
- else()
-- target_link_libraries(runtime ${LIBBCC_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_LIBRARIES})
- endif()
-
- if(STATIC_BPF_BCC)
- # These are not part of the static libbcc so have to be added separate
-- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES})
-- target_link_libraries(runtime ${LIBBPF_LIBRARIES})
-- target_link_libraries(runtime ${LIBBCC_LOADER_LIBRARY_STATIC})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBBCC_LOADER_LIBRARY_STATIC})
-
- add_library(LIBELF STATIC IMPORTED)
- set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBELF_LIBRARIES})
-- target_link_libraries(runtime LIBELF)
-+ set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBBPF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime LIBELF)
- else()
-- target_link_libraries(runtime ${LIBELF_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES})
- endif(STATIC_BPF_BCC)
-
- if (LIBDW_FOUND)
-@@ -195,16 +198,16 @@ if (LIBDW_FOUND)
-
- target_link_libraries(LIBDW INTERFACE ${LIBDW_LIBS})
-
-- target_link_libraries(runtime LIBDW)
-+ target_link_libraries(bpftraceruntime LIBDW)
- else()
-- target_link_libraries(runtime ${LIBDW_LIBRARIES})
-+ target_link_libraries(bpftraceruntime ${LIBDW_LIBRARIES})
- endif()
- endif()
-
- # Support for std::filesystem
- # GCC version <9 and Clang (all versions) require -lstdc++fs
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9")
-- target_link_libraries(runtime "stdc++fs")
-+ target_link_libraries(bpftraceruntime "stdc++fs")
- target_link_libraries(libbpftrace "stdc++fs")
- endif()
-
-@@ -226,16 +229,16 @@ endif()
- if (STATIC_LINKING)
- if(ANDROID)
- target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
-- target_link_libraries(runtime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz")
- else()
- target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
- target_link_libraries(libbpftrace "-Wl,-Bstatic" "-lz")
-- target_link_libraries(runtime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
-- target_link_libraries(runtime "-Wl,-Bstatic" "-lz")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm")
-+ target_link_libraries(bpftraceruntime "-Wl,-Bstatic" "-lz")
- endif()
- elseif(STATIC_BPF_BCC)
- # partial static build, libbpf needs zlib, bcc needs liblzma
-- target_link_libraries(runtime "-lz" "-llzma")
-+ target_link_libraries(bpftraceruntime "-lz" "-llzma")
- endif()
-
- unset(MAIN_SRC)
-diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt
-index c776d204..41e84317 100644
---- a/src/aot/CMakeLists.txt
-+++ b/src/aot/CMakeLists.txt
-@@ -1,8 +1,9 @@
- add_library(aot aot.cpp)
--add_dependencies(aot parser)
-+add_dependencies(aot bpftraceparser)
- 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)
-@@ -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(bpftraceast
- async_event_types.cpp
- attachpoint_parser.cpp
- elf_parser.cpp
-@@ -21,11 +21,13 @@ add_library(ast
- target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src)
- target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
- target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast ast_defs arch parser)
-+target_link_libraries(bpftraceast ast_defs bpftracearch 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
-@@ -58,20 +60,20 @@ 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})
-
- if(TARGET libclang_static)
-- target_link_libraries(ast libclang_static)
-+ target_link_libraries(bpftraceast libclang_static)
- else()
- # old LLVM versions don't export libclang_static in ClangTargets.cmake; fall back to
- # libclang.a in that case
-- target_link_libraries(ast libclang.a)
-+ target_link_libraries(abpftracest libclang.a)
- endif()
-
-- target_link_libraries(ast ${clang_libs})
-- target_link_libraries(ast ${llvm_libs})
-+ target_link_libraries(abpftracest ${clang_libs})
-+ target_link_libraries(abpftracest ${llvm_libs})
- endif()
-
- if(STATIC_LIBC)
-@@ -81,11 +83,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()
-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})
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-12-28 1:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-30 21:54 [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2023-12-28 1:03 Conrad Kostecki
2023-02-08 18:34 Patrick McLean
2022-09-27 21:44 Sam James
2022-07-18 17:33 Patrick McLean
2021-11-10 17:16 Jakov Smolić
2020-11-20 13:26 Aaron Bauman
2020-08-31 18:33 Patrick McLean
2019-03-16 20:48 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox