commit: 86cdb30121712b13ba63c7f44019e70658a4e278 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Mon Apr 19 23:49:47 2021 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 23:49:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cdb301
dev-util/bpftrace-0.12.1: Version bump Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-util/bpftrace/Manifest | 1 + dev-util/bpftrace/bpftrace-0.12.1.ebuild | 89 ++++++++++++ .../files/bpftrace-0.12.0-fuzzing-build.patch | 13 ++ .../files/bpftrace-0.12.0-install-libs.patch | 160 +++++++++++++++++++++ dev-util/bpftrace/metadata.xml | 3 + 5 files changed, 266 insertions(+) diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 786d756a582..babfffac440 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1 +1,2 @@ DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548 SHA512 611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82 +DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345 diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild b/dev-util/bpftrace/bpftrace-0.12.1.ebuild new file mode 100644 index 00000000000..cd944547539 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.12.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs llvm linux-info cmake + +DESCRIPTION="High-level tracing language for eBPF" +HOMEPAGE="https://github.com/iovisor/bpftrace"; + +if [[ ${PV} =~ 9{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/iovisor/${PN}"; + BDEPEND="" +else + MY_PV="${PV//_/}" + SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + BDEPEND="app-arch/xz-utils " +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="fuzzing test" + +COMMON_DEPEND=" + dev-libs/libbpf:= + >=dev-util/bcc-0.13.0:= + dev-util/systemtap + >=sys-devel/llvm-6:=[llvm_targets_BPF(+)] + <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] + <=sys-devel/clang-13:= + sys-libs/binutils-libs:= + virtual/libelf +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" +RDEPEND="${COMMON_DEPEND}" +BDEPEND+=" + >=dev-util/cmake-3.8 + sys-devel/flex + sys-devel/bison +" + +S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" +QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" + +PATCHES=( + "${FILESDIR}/bpftrace-0.12.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" + "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" + "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" +) + +# lots of fixing needed +RESTRICT="test" + +pkg_pretend() { + local CONFIG_CHECK=" + ~BPF + ~BPF_EVENTS + ~BPF_JIT + ~BPF_SYSCALL + ~FTRACE_SYSCALLS + ~HAVE_EBPF_JIT + " + + check_extra_config +} + +pkg_setup() { + LLVM_MAX_SLOT=12 llvm_pkg_setup +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local -a mycmakeargs=( + -DSTATIC_LINKING:BOOL=OFF + -DBUILD_TESTING:BOOL=OFF + -DBUILD_FUZZ:BOOL=$(usex fuzzing) + -DUSE_LIBFUZZER:BOOL=$(usex libfuzzer) + ) + + cmake_src_configure +} diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch new file mode 100644 index 00000000000..30f03eb8ff2 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/fuzz_main.cpp b/src/fuzz_main.cpp +index a08d0b03..82127be0 100644 +--- a/src/fuzz_main.cpp ++++ b/src/fuzz_main.cpp +@@ -135,7 +135,7 @@ int fuzz_main(const char* data, size_t sz) + struct utsname utsname; + uname(&utsname); + std::string ksrc, kobj; +- auto kdirs = get_kernel_dirs(utsname, !bpftrace.features_->has_btf()); ++ auto kdirs = get_kernel_dirs(utsname, !bpftrace.feature_->has_btf()); + ksrc = std::get<0>(kdirs); + kobj = std::get<1>(kdirs); + diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch new file mode 100644 index 00000000000..ef715ea5da8 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch @@ -0,0 +1,160 @@ +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..d35574f5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -145,7 +145,7 @@ 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) + + target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES}) + if(STATIC_LINKING) +@@ -194,6 +194,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") + diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml index 777f99f832c..0c520774865 100644 --- a/dev-util/bpftrace/metadata.xml +++ b/dev-util/bpftrace/metadata.xml @@ -4,6 +4,9 @@ <maintainer type="person"> <email>chutz...@gentoo.org</email> </maintainer> + <use> + <flag name="fuzzing">Build bpftrace for fuzzing</flag> + </use> <upstream> <remote-id type="github">iovisor/bpftrace</remote-id> </upstream>
