From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-util/bpftrace/Manifest | 13 +- dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild | 80 ----------- dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild | 85 ------------ dev-util/bpftrace/bpftrace-0.11.1.ebuild | 85 ------------ dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild | 85 ++++++++++++ dev-util/bpftrace/bpftrace-9999.ebuild | 6 +- .../files/bpftrace-0.10.0-install-libs.patch | 148 --------------------- .../files/bpftrace-0.10.0-llvm-multi.patch | 60 --------- .../bpftrace-0.10.0-no-bpf_detach_kfunc.patch | 13 -- 9 files changed, 91 insertions(+), 484 deletions(-) delete mode 100644 dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.11.1.ebuild create mode 100644 dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild delete mode 100644 dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch delete mode 100644 dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch delete mode 100644 dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch (limited to 'dev-util/bpftrace') diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 32a30795c5ea..b46009a8945d 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,13 +1,6 @@ AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a -AUX bpftrace-0.10.0-install-libs.patch 5790 BLAKE2B 93f12b430f8ba5772423fc0350c59d0f43b9de05fbbc03c4ef46c113886b74a330c397122daa6a423f4a6111b1d113679503b06d7e507f23a837dc06a4c662ca SHA512 585b1128e1a7d4cb92a38eb4043ff824179aed5767f9884d54714dbcc5148d95ca1e95b1fadbde520f57be60501d850c217204f7aed1c556ea5924e422c661bd -AUX bpftrace-0.10.0-llvm-multi.patch 2516 BLAKE2B 354882237ce984c776ae8f4c0c442a3f250b007d11a03d3bc794c69df9405d67ee09e0ae86ff2585ea025e941a246904e80556857e531c1f3fc06befba88c7da SHA512 5a5d6db61da9c1d07991500ab7feeb5aa945d11dc2f6387d7ccb04ff6a07da478d9a1005a79bba8ad04805eadca95fc72ffc3cc1ffc4bca76ea66f08ea56e2a8 -AUX bpftrace-0.10.0-no-bpf_detach_kfunc.patch 379 BLAKE2B cb796b682fa5b4a89d4f7e879e23d7b1fd3a8202b87467dec8cb3abb0b80edaa3b3353bfd56277d2a087541576a0066526110266b961ae36c57c833cb38c46b1 SHA512 be47a1f688f71c49d249a4ce1292e705f0cc5fb0ec73b77c976cde896325cd65423fba9999a5fba2d027230da02c8a8ebc5d2d73f22e46d53b42ae9528a8724d AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66 -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.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3 -EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5 -EBUILD bpftrace-0.11.0-r1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8 -EBUILD bpftrace-0.11.1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8 -EBUILD bpftrace-9999.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8 +DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B 950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e SHA512 76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c +EBUILD bpftrace-0.11.3-r1.ebuild 1568 BLAKE2B 7eed05d2ad5a514ec624fc8d028aab8f79dadec6f3e402812d20fc1669941f9c071bceb57ba68c509989739742d5558e9d6cd96bf0dff6e9f5b0211e3237215c SHA512 55d21fe383907e16087ec5c85c619f632be4f21457fd1217915a0a7b39918941605e4ce29f8f19e13d84fe1eebf90a7b1db2ca031647d3b46773945a396a4f54 +EBUILD bpftrace-9999.ebuild 1573 BLAKE2B 69c5ba3fc6278cd1b6098d174d8057c0ee758832a63716ff8864229deb35028d7ee5b738658cbb9787464391d250c35bf1933e0caf23fdbfc8d7f32422f86726 SHA512 aa783e719ee50be25065c696d291a1524b25949a43c78e9d7309cfbf5016ab413314a8575ac869bd45bb35fb9e251b0ea272f195b38cf1f20afb3b0783baacd7 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild deleted file mode 100644 index 26c1753afef8..000000000000 --- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild +++ /dev/null @@ -1,80 +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.10.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch" - # bpf_detach_kfunc has always been a noop - "${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.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/bpftrace-0.11.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild deleted file mode 100644 index 6eeeb6c28d67..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild +++ /dev/null @@ -1,85 +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:= - >=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=11 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.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild deleted file mode 100644 index 6eeeb6c28d67..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.1.ebuild +++ /dev/null @@ -1,85 +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:= - >=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=11 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.11.3-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild new file mode 100644 index 000000000000..b941fc56d719 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild @@ -0,0 +1,85 @@ +# 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 + dev-libs/libbpf:= + >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] + <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] + <=sys-devel/clang-12:= + >=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=11 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-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild index 6eeeb6c28d67..2a14dc584768 100644 --- a/dev-util/bpftrace/bpftrace-9999.ebuild +++ b/dev-util/bpftrace/bpftrace-9999.ebuild @@ -25,10 +25,10 @@ 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:= + <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] + <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= virtual/libelf " 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 cf5ed9d76b96..000000000000 --- 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) diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch deleted file mode 100644 index 48eeeb8e2001..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-05-20 21:00:22.789744736 -0500 -+++ b/CMakeLists.txt 2020-05-20 18:52:38.241091110 -0500 -@@ -30,6 +30,11 @@ - elseif(STATIC_LIBC) - message(WARNING "static libc is known to cause problems, consider STATIC_LIBC=OFF. Proceed at your own risk") #iovisor/bpftrace/issues/266 - endif() -+else() -+ find_package(LLVM 9 REQUIRED CONFIG) -+ -+ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") -+ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") - endif() - - if(EMBED_LIBCLANG_ONLY AND NOT EMBED_CLANG) -diff -ru a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt ---- a/src/ast/CMakeLists.txt 2020-05-20 21:00:22.777744534 -0500 -+++ b/src/ast/CMakeLists.txt 2020-05-20 20:52:39.657888690 -0500 -@@ -42,26 +41,29 @@ - if(EMBED_LIBCLANG_ONLY) - unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM") - endif() -- target_link_libraries(bpftraceast ${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(bpftraceast ${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(bpftraceast ${clang_libs}) -- target_link_libraries(bpftraceast ${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(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(bpftraceast ${llvm_libs}) -+ find_package(LLVM 9 REQUIRED CONFIG) -+ -+ include_directories(${LLVM_INCLUDE_DIRS}) -+ add_definitions(${LLVM_DEFINITIONS}) -+ -+ find_library(found_clang clang HINTS ${LLVM_LIBRARY_DIRS}) -+ if(found_clang) -+ target_link_libraries(bpftraceast ${found_clang}) - endif() -- target_link_libraries(bpftraceast libclang) -+ 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(bpftraceast ${llvm_libs}) - endif() diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch deleted file mode 100644 index 145fb1c0ca91..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp -index c7e789e..08f657e 100644 ---- a/src/attached_probe.cpp -+++ b/src/attached_probe.cpp -@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void) - int AttachedProbe::detach_kfunc(void) - { - close(tracing_fd_); -- return bpf_detach_kfunc(progfd_, NULL); -+ return 0; - } - #else - void AttachedProbe::attach_kfunc(void) -- cgit v1.2.3