commit: d462006c30f8bcaa267ad7acff1692e88128429c Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Tue Aug 25 00:18:56 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Tue Aug 25 00:18:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d462006c
dev-util/bpftrace: Remove old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-util/bpftrace/Manifest | 3 - dev-util/bpftrace/bpftrace-0.11.0.ebuild | 86 ------------ dev-util/bpftrace/bpftrace-0.9.2.ebuild | 68 ---------- dev-util/bpftrace/bpftrace-0.9.3.ebuild | 68 ---------- dev-util/bpftrace/bpftrace-0.9.4.ebuild | 76 ----------- .../bpftrace-0.10_pre20190614-install-libs.patch | 115 ---------------- .../files/bpftrace-0.9.3-install-libs.patch | 129 ------------------ .../files/bpftrace-0.9.4-install-libs.patch | 141 -------------------- .../bpftrace/files/bpftrace-0.9.4-llvm-10.patch | 144 --------------------- 9 files changed, 830 deletions(-) diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 76af8334ccf..05368aaf51b 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,5 +1,2 @@ DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9 DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5 -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.4.tar.gz 792253 BLAKE2B d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5 SHA512 d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da diff --git a/dev-util/bpftrace/bpftrace-0.11.0.ebuild b/dev-util/bpftrace/bpftrace-0.11.0.ebuild deleted file mode 100644 index eab73335433..00000000000 --- a/dev-util/bpftrace/bpftrace-0.11.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2019-2020 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="test" - -COMMON_DEPEND=" - dev-util/systemtap - sys-devel/clang:= - dev-libs/libbpf:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - <sys-devel/clang-10:= - <sys-devel/llvm-10:=[llvm_targets_BPF(+)] - >=dev-util/bcc-0.13.0:= - 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.11.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.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=9 llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake_src_configure -} diff --git a/dev-util/bpftrace/bpftrace-0.9.2.ebuild b/dev-util/bpftrace/bpftrace-0.9.2.ebuild deleted file mode 100644 index 5fcb41040f5..00000000000 --- a/dev-util/bpftrace/bpftrace-0.9.2.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/bpftrace-0.9.3.ebuild b/dev-util/bpftrace/bpftrace-0.9.3.ebuild deleted file mode 100644 index 74f1dd849d2..00000000000 --- a/dev-util/bpftrace/bpftrace-0.9.3.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.9.3-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/bpftrace-0.9.4.ebuild b/dev-util/bpftrace/bpftrace-0.9.4.ebuild deleted file mode 100644 index ad25d1221e1..00000000000 --- a/dev-util/bpftrace/bpftrace-0.9.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2019-2020 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.12.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.9.4-llvm-10.patch" - "${FILESDIR}/bpftrace-0.9.4-install-libs.patch" - "${FILESDIR}/bpftrace-mandir.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 -} - -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.10_pre20190614-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch deleted file mode 100644 index f4483570c99..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e8870c6..a55385d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,9 +47,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 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 e737119..b2b17e2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -30,7 +30,8 @@ endif(HAVE_BCC_ELF_FOREACH_SYM) - 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 a26f610..53627e2 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,5 +1,7 @@ - if(CMAKE_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 4d77c9f..2a00572 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 -@@ -7,15 +7,16 @@ add_library(ast - ) - - if(HAVE_GET_CURRENT_CGROUP_ID) -- target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID) -+ target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID) - endif(HAVE_GET_CURRENT_CGROUP_ID) - --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 -@@ -35,16 +36,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() diff --git a/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch deleted file mode 100644 index 0ddb07b4740..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e0d770..d51edf6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,9 +51,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 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 65f3a34..b001a83 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -56,7 +56,8 @@ if (ALLOW_UNSAFE_UPROBE) - target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_UPROBE) - endif(ALLOW_UNSAFE_UPROBE) - --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 a26f610..53627e2 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,5 +1,7 @@ - if(CMAKE_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 4d77c9f..2a00572 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 -@@ -7,15 +7,16 @@ add_library(ast - ) - - if(HAVE_GET_CURRENT_CGROUP_ID) -- target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID) -+ target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID) - endif(HAVE_GET_CURRENT_CGROUP_ID) - --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 -@@ -35,16 +36,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() -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 2d18277..f66a8b7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -76,7 +76,8 @@ if(HAVE_BFD_DISASM) - target_link_libraries(bpftrace_test ${LIBOPCODES_LIBRARIES}) - endif(HAVE_BFD_DISASM) - --target_link_libraries(bpftrace_test arch ast parser resources) -+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser -+ bpftraceresources) - - if (STATIC_LINKING) - target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES}) diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch deleted file mode 100644 index fe3fc29fd9b..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2b214c1..a787d7d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -85,9 +85,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 5b9a95d..b1ccf7a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -68,7 +68,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) - - if(STATIC_LINKING) - target_link_libraries(bpftrace ${LIBBCC_LIBRARIES}) -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index edb0654..e57c8c5 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,8 +1,10 @@ - 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) - 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 f280f47..5db9246 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 - field_analyser.cpp -@@ -7,12 +7,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 -@@ -36,26 +37,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 211c47b..2fb73ef 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -88,7 +88,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) - - if (STATIC_LINKING) - if(EMBED_LLVM OR EMBED_CLANG) diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch deleted file mode 100644 index c2131cbbc30..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/src/ast/codegen_llvm.cpp b/src/ast/codegen_llvm.cpp -index f81906c..bcc2c7d 100644 ---- a/src/ast/codegen_llvm.cpp -+++ b/src/ast/codegen_llvm.cpp -@@ -41,7 +41,7 @@ void CodegenLLVM::visit(PositionalParameter ¶m) - { - Constant *const_str = ConstantDataArray::getString(module_->getContext(), pstr, true); - AllocaInst *buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), pstr.length() + 1), "str"); -- b_.CreateMemSet(buf, b_.getInt8(0), pstr.length() + 1, 1); -+ b_.CREATE_MEMSET(buf, b_.getInt8(0), pstr.length() + 1, 1); - b_.CreateStore(const_str, buf); - expr_ = buf; - } -@@ -156,7 +156,7 @@ void CodegenLLVM::visit(Builtin &builtin) - { - AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "comm"); - // initializing memory needed for older kernels: -- b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1); -+ b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1); - b_.CreateGetCurrentComm(buf, builtin.type.size); - expr_ = buf; - } -@@ -189,7 +189,7 @@ void CodegenLLVM::visit(Builtin &builtin) - if (builtin.type.type == Type::usym) - { - AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "func"); -- b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1); -+ b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1); - Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32); - Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0)); - Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)}); -@@ -444,7 +444,7 @@ void CodegenLLVM::visit(Call &call) - else if (call.func == "str") - { - AllocaInst *strlen = b_.CreateAllocaBPF(b_.getInt64Ty(), "strlen"); -- b_.CreateMemSet(strlen, b_.getInt8(0), sizeof(uint64_t), 1); -+ b_.CREATE_MEMSET(strlen, b_.getInt8(0), sizeof(uint64_t), 1); - if (call.vargs->size() > 1) { - call.vargs->at(1)->accept(*this); - Value *proposed_strlen = b_.CreateAdd(expr_, b_.getInt64(1)); // add 1 to accommodate probe_read_str's null byte -@@ -462,7 +462,7 @@ void CodegenLLVM::visit(Call &call) - b_.CreateStore(b_.getInt64(bpftrace_.strlen_), strlen); - } - AllocaInst *buf = b_.CreateAllocaBPF(bpftrace_.strlen_, "str"); -- b_.CreateMemSet(buf, b_.getInt8(0), bpftrace_.strlen_, 1); -+ b_.CREATE_MEMSET(buf, b_.getInt8(0), bpftrace_.strlen_, 1); - call.vargs->front()->accept(*this); - b_.CreateProbeReadStr(buf, b_.CreateLoad(strlen), expr_); - b_.CreateLifetimeEnd(strlen); -@@ -541,7 +541,7 @@ void CodegenLLVM::visit(Call &call) - { - // store uint64_t[2] with: [0]: (uint64_t)addr, [1]: (uint64_t)pid - AllocaInst *buf = b_.CreateAllocaBPF(call.type, "usym"); -- b_.CreateMemSet(buf, b_.getInt8(0), call.type.size, 1); -+ b_.CREATE_MEMSET(buf, b_.getInt8(0), call.type.size, 1); - Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32); - Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0)); - Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)}); -@@ -592,7 +592,7 @@ void CodegenLLVM::visit(Call &call) - b_.CreateStore(af_type, af_offset); - - Value *inet_offset = b_.CreateGEP(buf, {b_.getInt32(0), b_.getInt32(1)}); -- b_.CreateMemSet(inet_offset, b_.getInt8(0), 16, 1); -+ b_.CREATE_MEMSET(inet_offset, b_.getInt8(0), 16, 1); - - inet->accept(*this); - if (inet->type.type == Type::array) -@@ -663,7 +663,7 @@ void CodegenLLVM::visit(Call &call) - auto &map = static_cast<Map&>(arg); - Constant *const_str = ConstantDataArray::getString(module_->getContext(), map.ident, true); - AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), map.ident.length() + 1), "str"); -- b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1); -+ b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1); - b_.CreateStore(const_str, str_buf); - ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(), sizeof(uint64_t) + 2 * sizeof(uint64_t) + map.ident.length() + 1); - AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata"); -@@ -707,7 +707,7 @@ void CodegenLLVM::visit(Call &call) - auto &map = static_cast<Map&>(arg); - Constant *const_str = ConstantDataArray::getString(module_->getContext(), map.ident, true); - AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), map.ident.length() + 1), "str"); -- b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1); -+ b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1); - b_.CreateStore(const_str, str_buf); - ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(), sizeof(uint64_t) + map.ident.length() + 1); - AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata"); -@@ -1204,7 +1204,7 @@ void CodegenLLVM::visit(FieldAccess &acc) - { - AllocaInst *dst = b_.CreateAllocaBPF(field.type, type.cast_type + "." + acc.field); - // memset so verifier doesn't complain about reading uninitialized stack -- b_.CreateMemSet(dst, b_.getInt8(0), field.type.size, 1); -+ b_.CREATE_MEMSET(dst, b_.getInt8(0), field.type.size, 1); - b_.CreateProbeRead(dst, field.bitfield.read_bytes, src); - Value *raw = b_.CreateLoad(dst); - Value *shifted = b_.CreateLShr(raw, field.bitfield.access_rshift); -@@ -1906,7 +1906,7 @@ void CodegenLLVM::createFormatStringCall(Call &call, int &id, CallArgs &call_arg - } - - AllocaInst *fmt_args = b_.CreateAllocaBPF(fmt_struct, call_name + "_args"); -- b_.CreateMemSet(fmt_args, b_.getInt8(0), struct_size, 1); -+ b_.CREATE_MEMSET(fmt_args, b_.getInt8(0), struct_size, 1); - - Value *id_offset = b_.CreateGEP(fmt_args, {b_.getInt32(0), b_.getInt32(0)}); - b_.CreateStore(b_.getInt64(id + asyncactionint(async_action)), id_offset); -diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp -index eb84f7b..5dd72d0 100644 ---- a/src/ast/irbuilderbpf.cpp -+++ b/src/ast/irbuilderbpf.cpp -@@ -82,7 +82,7 @@ AllocaInst *IRBuilderBPF::CreateAllocaBPFInit(const SizedType &stype, const std: - } - else - { -- CreateMemSet(alloca, getInt64(0), stype.size, 1); -+ CREATE_MEMSET(alloca, getInt64(0), stype.size, 1); - } - - restoreIP(ip); -@@ -226,7 +226,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(int mapfd, AllocaInst *key, SizedType & - - SetInsertPoint(lookup_failure_block); - if (is_array) -- CreateMemSet(value, getInt8(0), type.size, 1); -+ CREATE_MEMSET(value, getInt8(0), type.size, 1); - else - CreateStore(getInt64(0), value); - CreateBr(lookup_merge_block); -diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h -index 58e6882..6b2e7f1 100644 ---- a/src/ast/irbuilderbpf.h -+++ b/src/ast/irbuilderbpf.h -@@ -18,6 +18,14 @@ - #error Unsupported LLVM version - #endif - -+#if LLVM_VERSION_MAJOR >= 10 -+#define CREATE_MEMSET(ptr, val, size, align) \ -+ CreateMemSet((ptr), (val), (size), MaybeAlign((align))) -+#else -+#define CREATE_MEMSET(ptr, val, size, align) \ -+ CreateMemSet((ptr), (val), (size), (align)) -+#endif -+ - namespace bpftrace { - namespace ast { -
