commit: 27197f6f27414fa4a2394bc0169b1b19b1e6efb0 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Tue Dec 17 12:59:53 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 17 14:34:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27197f6f
dev-debug/bpftrace: clean up old versions Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-debug/bpftrace/Manifest | 3 - dev-debug/bpftrace/bpftrace-0.20.1-r2.ebuild | 100 ------- dev-debug/bpftrace/bpftrace-0.20.4.ebuild | 99 ------- dev-debug/bpftrace/bpftrace-0.21.1.ebuild | 95 ------ .../files/bpftrace-0.15.0-dont-compress-man.patch | 47 --- .../files/bpftrace-0.20.0-install-libs.patch | 320 --------------------- .../bpftrace/files/bpftrace-0.20.1-fuzzer.patch | 42 --- 7 files changed, 706 deletions(-) diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest index c41907a14253..62c16a37134b 100644 --- a/dev-debug/bpftrace/Manifest +++ b/dev-debug/bpftrace/Manifest @@ -1,6 +1,3 @@ -DIST bpftrace-0.20.1.gh.tar.gz 1233431 BLAKE2B fe9221a94d58b43e0311f8c841df8421c3fe226a3fe61f2ec5cce5de309acdb69a68834e92a2e622a1750975869cbdaa95a90f9afb83989aa61b56b551fa96e3 SHA512 fdcc2b0d091d4ab428207877626b0fb37f3e0778730e6a6db26be869a086264e1f24186857c47597813aacde98621a66301bcf6c8004f77bdf9ebf180f198ba0 -DIST bpftrace-0.20.4.gh.tar.gz 1233327 BLAKE2B ef98dbae80285c42b6322c10666345600e594e7043184e7191c77a3158e8c188b7448a580c00b656c1c352601fc1898178d17a7f88f4f1f174187440074832b2 SHA512 a8d5b5bd7d35f9bb308cd7d0ae4eaee899312d3e6540164d3b29eac61159983ea01350311f53b7b6c5023844bde9a2cd3a2d50459116261a536c0e6e52963462 -DIST bpftrace-0.21.1.gh.tar.gz 1293781 BLAKE2B 154acfd076bd10d1ea7f81b77f8fe6b94812be7fc82bf798f508fa94a5558b068e1ec4bde7cecf51d1076593032d7674a5c0cde6432be7bb6dc4781656104915 SHA512 db6f5faf65fc2ac55ffbd1799b70941b8a6e4036c7fc2f56fe134f932dcf8a14fdd11a5a8b1d4b20261932d2d1ac18636cc1d7d4b87b31e366a9e53514a84ad3 DIST bpftrace-0.21.2-man.gh.tar.xz 73044 BLAKE2B 3adcd021ae6849933d488ab140cc0608cd9d1aa9df125f180a67bc85965105ae07f645ecf885ce8b6ac3a340c5f73761e0fab14309f3654b52c9deaeacf521fc SHA512 95b05a04dec92a9c24f84a2603436e0c2f5fc7b08aafa69a2cf0843497f9100a7a104f8d3b4e654e5eb0640f272756d8d86ed4563d40ea592edbcad34af2dfa7 DIST bpftrace-0.21.2.gh.tar.gz 1299415 BLAKE2B 5a5d00c94c188ea4bc5008a88c9c244b0da4ac6f74c2b7083e13b8da9b0c566efc30fd9c7164f562505a4c72e6def1f2be4e360e3cd4556366e9a0aa3e1d3cf8 SHA512 8c64de94da29030dcde0680be90e3c16a5cd965a0066b1abe3c0740f11a78d70f383bf2e0bbe2fce639eddc7d45cb44508cc8a78743c205d7efa45734151e743 DIST bpftrace-0.21.3-man.gh.tar.xz 73044 BLAKE2B 3adcd021ae6849933d488ab140cc0608cd9d1aa9df125f180a67bc85965105ae07f645ecf885ce8b6ac3a340c5f73761e0fab14309f3654b52c9deaeacf521fc SHA512 95b05a04dec92a9c24f84a2603436e0c2f5fc7b08aafa69a2cf0843497f9100a7a104f8d3b4e654e5eb0640f272756d8d86ed4563d40ea592edbcad34af2dfa7 diff --git a/dev-debug/bpftrace/bpftrace-0.20.1-r2.ebuild b/dev-debug/bpftrace/bpftrace-0.20.1-r2.ebuild deleted file mode 100644 index 156c1278ceef..000000000000 --- a/dev-debug/bpftrace/bpftrace-0.20.1-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=17 - -inherit llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace"; -MY_PV="${PV//_/}" -SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" - -# remove keywords until build works: -# https://github.com/iovisor/bpftrace/issues/2349 -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="fuzzing test" - -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libbpf-1.1:= - >=dev-util/bcc-0.25.0:= - >=llvm-core/llvm-10[llvm_targets_BPF(+)] - >=llvm-core/clang-10 - <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= - <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] - sys-process/procps - sys-libs/binutils-libs:= - virtual/libelf:= -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - app-alternatives/yacc - test? ( - app-editors/vim-core - dev-util/pahole - ) - virtual/pkgconfig -" - -QA_DT_NEEDED=" - usr/lib.*/libbpftraceresources.so - usr/lib.*/libcxxdemangler_llvm.so -" - -PATCHES=( - "${FILESDIR}/bpftrace-0.20.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.20.1-fuzzer.patch" -) - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_TESTING:BOOL=$(usex test) - -DBUILD_FUZZ:BOOL=$(usex fuzzing) - -DENABLE_MAN:BOOL=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - # bug 809362 - dostrip -x /usr/bin/bpftrace - doman man/man8/*.? -} diff --git a/dev-debug/bpftrace/bpftrace-0.20.4.ebuild b/dev-debug/bpftrace/bpftrace-0.20.4.ebuild deleted file mode 100644 index aef9b31fd046..000000000000 --- a/dev-debug/bpftrace/bpftrace-0.20.4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=17 - -inherit llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace"; -MY_PV="${PV//_/}" -SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" - -# remove keywords until build works: -# https://github.com/iovisor/bpftrace/issues/2349 -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" - -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libbpf-1.1:= - >=dev-util/bcc-0.25.0:= - >=llvm-core/llvm-10[llvm_targets_BPF(+)] - >=llvm-core/clang-10 - <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= - <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] - sys-process/procps - sys-libs/binutils-libs:= - virtual/libelf:= -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - app-alternatives/yacc - test? ( - app-editors/vim-core - dev-util/pahole - ) - virtual/pkgconfig -" - -QA_DT_NEEDED=" - usr/lib.*/libbpftraceresources.so - usr/lib.*/libcxxdemangler_llvm.so -" - -PATCHES=( - "${FILESDIR}/bpftrace-0.20.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_TESTING:BOOL=$(usex test) - -DBUILD_FUZZ:BOOL=OFF - -DENABLE_MAN:BOOL=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - # bug 809362 - dostrip -x /usr/bin/bpftrace - doman man/man8/*.? -} diff --git a/dev-debug/bpftrace/bpftrace-0.21.1.ebuild b/dev-debug/bpftrace/bpftrace-0.21.1.ebuild deleted file mode 100644 index 8e87325fe4ad..000000000000 --- a/dev-debug/bpftrace/bpftrace-0.21.1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=18 - -inherit llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/bpftrace/bpftrace"; -MY_PV="${PV//_/}" -SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" - -LICENSE="Apache-2.0" -SLOT="0" - -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="lldb test" - -# lots of fixing needed -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libbpf-1.1:= - >=dev-util/bcc-0.25.0:= - lldb? ( >=llvm-core/lldb-15 ) - >=llvm-core/llvm-15[llvm_targets_BPF(+)] - >=llvm-core/clang-15 - <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= - <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] - sys-process/procps - sys-libs/binutils-libs:= - virtual/libelf:= -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - app-alternatives/yacc - test? ( - app-editors/vim-core - dev-util/pahole - ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - local mycmakeargs=( - # prevent automagic lldb use - $(cmake_use_find_package lldb LLDB) - # DO NOT build the internal libs as shared - -DBUILD_SHARED_LIBS=OFF - # DO dynamically link the bpftrace executable - -DSTATIC_LINKING:BOOL=OFF - # bug 809362, 754648 - -DBUILD_TESTING:BOOL=$(usex test) - -DBUILD_FUZZ:BOOL=OFF - -DENABLE_MAN:BOOL=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - doman man/man8/*.? -} diff --git a/dev-debug/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch b/dev-debug/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch deleted file mode 100644 index 84241e052462..000000000000 --- a/dev-debug/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch +++ /dev/null @@ -1,47 +0,0 @@ -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) diff --git a/dev-debug/bpftrace/files/bpftrace-0.20.0-install-libs.patch b/dev-debug/bpftrace/files/bpftrace-0.20.0-install-libs.patch deleted file mode 100644 index 7369875ad5ef..000000000000 --- a/dev-debug/bpftrace/files/bpftrace-0.20.0-install-libs.patch +++ /dev/null @@ -1,320 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46a2579e..7fa09199 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -102,9 +102,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/src/CMakeLists.txt b/src/CMakeLists.txt -index 88f5928c..4dee1ec8 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 -@@ -46,7 +46,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 -@@ -63,6 +63,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) -@@ -91,7 +92,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( -@@ -111,10 +112,10 @@ 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}) - target_include_directories(libbpftrace PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) - -@@ -124,8 +125,9 @@ 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) -+install(TARGETS bpftraceruntime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(LIBPCAP_FOUND) - target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES}) -@@ -135,49 +137,49 @@ if(HAVE_BFD_DISASM) - if(STATIC_LINKING OR LIBBFD_STATIC) - 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) - - add_library(LIBZSTD STATIC IMPORTED) - if (LIBZSTD_FOUND) - set_property(TARGET LIBZSTD PROPERTY IMPORTED_LOCATION ${LIBZSTD_LIBRARIES}) -- target_link_libraries(runtime LIBZSTD) -+ target_link_libraries(bpftraceruntime LIBZSTD) - endif(LIBZSTD_FOUND) - - add_library(LIBSFRAME STATIC IMPORTED) - if (LIBSFRAME_FOUND) - set_property(TARGET LIBSFRAME PROPERTY IMPORTED_LOCATION ${LIBSFRAME_LIBRARIES}) -- target_link_libraries(runtime LIBSFRAME) -+ target_link_libraries(bpftraceruntime LIBSFRAME) - endif() - 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 OR LIBBFD_STATIC) - 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_LINKING) - # 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) -+ target_link_libraries(bpftraceruntime LIBELF) - else() -- target_link_libraries(runtime ${LIBELF_LIBRARIES}) -+ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES}) - endif(STATIC_LINKING) - - if (LIBDW_FOUND) -@@ -206,16 +208,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() - -@@ -237,12 +239,12 @@ 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() - endif() - -diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt -index 36ffd739..a7989df0 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 e6a1d0a0..c53daa19 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,19 +1,20 @@ - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|aarch64)") -- add_library(arch arm.cpp) -+ add_library(bpftracearch arm.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") -- add_library(arch ppc64.cpp) -+ add_library(bpftracearch ppc64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") -- add_library(arch s390.cpp) -+ add_library(bpftracearch s390.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- add_library(arch x86_64.cpp) -+ add_library(bpftracearch x86_64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64") -- add_library(arch mips64.cpp) -+ add_library(bpftracearch mips64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") -- add_library(arch riscv64.cpp) -+ add_library(bpftracearch riscv64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64") -- add_library(arch loongarch64.cpp) -+ add_library(bpftracearch loongarch64.cpp) - else() - message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") - endif() -+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt -index 65eab229..0bf35ec7 100644 ---- a/src/ast/CMakeLists.txt -+++ b/src/ast/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_library(ast_defs ast.cpp) - --add_library(ast -+add_library(bpftraceast - async_event_types.cpp - attachpoint_parser.cpp - dibuilderbpf.cpp -@@ -23,11 +23,13 @@ add_library(ast - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) - target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) --target_link_libraries(ast ast_defs arch parser) -+target_link_libraries(bpftraceast ast_defs bpftracearch 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) - include(Util) -@@ -69,23 +71,23 @@ if(STATIC_LINKING) - unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "$<LINK_ONLY:clang-cpp>") - - 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(bpftraceast libclang.a) - endif() - -- target_link_libraries(ast ${clang_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(bpftraceast ${clang_libs}) -+ target_link_libraries(bpftraceast ${llvm_libs}) - 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_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/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt -index a7598e93..ff816cba 100644 ---- a/src/resources/CMakeLists.txt -+++ b/src/resources/CMakeLists.txt -@@ -21,4 +21,5 @@ function(embed_headers output_h output_cpp) - endfunction() - - embed_headers(${CMAKE_CURRENT_BINARY_DIR}/headers.h ${CMAKE_CURRENT_BINARY_DIR}/headers.cpp) --add_library(resources ${CMAKE_CURRENT_BINARY_DIR}/headers.cpp) -+add_library(bpftraceresources ${CMAKE_CURRENT_BINARY_DIR}/headers.cpp) -+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch b/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch deleted file mode 100644 index a0f54e4962f3..000000000000 --- a/dev-debug/bpftrace/files/bpftrace-0.20.1-fuzzer.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/bpftrace/bpftrace/commit/fe6362b4e2c1b9d0833c7d3f308c1d4006b54723 - -From fe6362b4e2c1b9d0833c7d3f308c1d4006b54723 Mon Sep 17 00:00:00 2001 -From: gkamathe <[email protected]> -Date: Fri, 16 Feb 2024 18:19:14 +0530 -Subject: [PATCH] =?UTF-8?q?fix=20bpftrace=5Ffuzz=20error=20for=20call=20to?= - =?UTF-8?q?=20'get=5Fkernel=E2=80=A6=5Fcflags'=20(#3007)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* fix bpftrace_fuzz error: no matching function for call to 'get_kernel_cflags' - -When compiling bpftace_fuzz we run into the following issue where 1 -argument is missing, adding the required argument - -src/fuzz_main.cpp:140:21: error: no matching function for call to 'get_kernel_cflags' - extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj); - ^~~~~~~~~~~~~~~~~ -src/utils.h:180:26: note: candidate function not viable: requires 4 arguments, but 3 were provided -std::vector<std::string> get_kernel_cflags(const char *uname_machine, - ^ -Seems fourth argument was added via 4bcee640636e268de4b938a1007fb29a8836f049 - -Signed-off-by: Gaurav Kamathe <[email protected]> - ---------- - -Signed-off-by: Gaurav Kamathe <[email protected]> ---- a/src/fuzz_main.cpp -+++ b/src/fuzz_main.cpp -@@ -137,7 +137,8 @@ int fuzz_main(const char* data, size_t sz) - kobj = std::get<1>(kdirs); - - if (ksrc != "") -- extra_flags = get_kernel_cflags(utsname.machine, ksrc, kobj); -+ extra_flags = get_kernel_cflags( -+ utsname.machine, ksrc, kobj, bpftrace.kconfig); - } - extra_flags.push_back("-include"); - extra_flags.push_back(CLANG_WORKAROUNDS_H); -
