diff options
| -rw-r--r-- | dev-util/bpftrace/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 66 | ||||
| -rw-r--r-- | dev-util/bpftrace/bpftrace-0.9.1.ebuild | 68 | ||||
| -rw-r--r-- | dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch | 30 | ||||
| -rw-r--r-- | dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch | 111 |
5 files changed, 0 insertions, 277 deletions
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 2b07beb39111..f81c8a38367e 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,4 +1,2 @@ -DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B 03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46 SHA512 e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0 DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be -DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8 diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild deleted file mode 100644 index 74351e85e8c4..000000000000 --- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs linux-info cmake-utils - -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 - SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -COMMON_DEPEND="sys-devel/clang:= - dev-libs/libbpf:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - >=dev-util/bcc-0.9.0:= - virtual/libelf" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND+="dev-util/cmake - sys-devel/flex - sys-devel/bison" - -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch" - "${FILESDIR}/bpftrace-mandir.patch" - "${FILESDIR}/bpftrace-0.9-llvm-8.patch" -) - -# lots of fixing needed -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS" - - check_extra_config -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake-utils_src_configure -} diff --git a/dev-util/bpftrace/bpftrace-0.9.1.ebuild b/dev-util/bpftrace/bpftrace-0.9.1.ebuild deleted file mode 100644 index 5fcb41040f5d..000000000000 --- a/dev-util/bpftrace/bpftrace-0.9.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs linux-info cmake-utils - -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="test" - -COMMON_DEPEND="dev-util/systemtap - sys-devel/clang:= - dev-libs/libbpf:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - >=dev-util/bcc-0.10.0:= - virtual/libelf" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND+="dev-util/cmake - sys-devel/flex - sys-devel/bison" - -S="${WORKDIR}/${PN}-${MY_PV}" -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch" - "${FILESDIR}/bpftrace-mandir.patch" -) - -# lots of fixing needed -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS" - - check_extra_config -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake-utils_src_configure -} diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch deleted file mode 100644 index 14d6a167a863..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/bpforc.h b/src/bpforc.h -index a6ee583..8d0e579 100644 ---- a/src/bpforc.h -+++ b/src/bpforc.h -@@ -80,8 +80,13 @@ class BpfOrc - ExecutionSession ES; - std::unique_ptr<TargetMachine> TM; - std::shared_ptr<SymbolResolver> Resolver; -+#if LLVM_VERSION_MAJOR >= 8 -+ LegacyRTDyldObjectLinkingLayer ObjectLayer; -+ LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer; -+#else - RTDyldObjectLinkingLayer ObjectLayer; - IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer; -+#endif - - public: - std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_; -@@ -91,7 +96,11 @@ class BpfOrc - Resolver(createLegacyLookupResolver(ES, - [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; }, - [](Error Err) { cantFail(std::move(Err), "lookup failed"); })), -+#if LLVM_VERSION_MAJOR >= 8 -+ ObjectLayer(ES, [this](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }), -+#else - ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }), -+#endif - CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {} - - void compileModule(std::unique_ptr<Module> M) { diff --git a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch deleted file mode 100644 index 68bd82559443..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ff6e1f..a276ba2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,9 +43,10 @@ find_package(FLEX REQUIRED) - bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc) - 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 b8b0d96..0803c1e 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 b47f66d..36de26b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -27,7 +27,8 @@ endif(HAVE_BCC_CREATE_MAP) - if(HAVE_GET_CURRENT_CGROUP_ID) - target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID) - endif(HAVE_GET_CURRENT_CGROUP_ID) --target_link_libraries(bpftrace arch ast parser resources) -+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser -+ bpftraceresources) - - if (STATIC_LINKING) - target_link_libraries(bpftrace ${LIBBCC_LIBRARIES}) -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index 425926e..13b5d31 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,5 +1,7 @@ - if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") -- add_library(arch aarch64.cpp) -+ add_library(bpftracearch aarch64.cpp) - else() -- add_library(arch x86_64.cpp) -+ add_library(bpftracearch x86_64.cpp) - endif() -+ -+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt -index 64db7b9..1a2eb6e 100644 ---- a/src/ast/CMakeLists.txt -+++ b/src/ast/CMakeLists.txt -@@ -1,4 +1,4 @@ --add_library(ast -+add_library(bpftraceast - ast.cpp - codegen_llvm.cpp - irbuilderbpf.cpp -@@ -6,12 +6,13 @@ 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) - --add_dependencies(ast parser) -+add_dependencies(bpftraceast bpftraceparser) -+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if (STATIC_LINKING) - set(clang_libs -@@ -31,16 +32,16 @@ if (STATIC_LINKING) - clangSerialization - clangToolingCore) - 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}) - 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() |