From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- dev-util/bpftrace/Manifest | 8 +- dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild | 89 ------------ dev-util/bpftrace/bpftrace-0.11.4.ebuild | 86 ------------ dev-util/bpftrace/bpftrace-0.13.0.ebuild | 88 ++++++++++++ dev-util/bpftrace/bpftrace-9999.ebuild | 85 ----------- .../files/bpftrace-0.11.0-install-libs.patch | 156 --------------------- .../files/bpftrace-0.13.0-install-libs.patch | 143 +++++++++++++++++++ 7 files changed, 234 insertions(+), 421 deletions(-) delete mode 100644 dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.11.4.ebuild create mode 100644 dev-util/bpftrace/bpftrace-0.13.0.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-9999.ebuild delete mode 100644 dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch create mode 100644 dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch (limited to 'dev-util/bpftrace') diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 923f276a3b8d..f65e842de3c2 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,12 +1,10 @@ AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a -AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113 AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59 AUX bpftrace-0.12.0-install-libs.patch 6364 BLAKE2B e4b59b882c04f58c711f61653f2cb5f28a99f06891d979372e854bae1f125dba43bb64a65a14bd8e85ac97ae8b3e933ab1cc61a2ff9253113428394fbbebe599 SHA512 d9efc5bc544cb97eda647c84ee917851d3c63ff9648b2d026a8e699d5b0d3755f06983984c793cbf2efe865f15588d7d1e414e7b16026067aa5bc5dafb05c456 -DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548 SHA512 611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82 +AUX bpftrace-0.13.0-install-libs.patch 5639 BLAKE2B 985ac0627c802d2a6207e02913dac49ab75615313fd76150984074f17aa69d97387c6e492d1d15d55e1556abeff6d35cf1856a5326065ec0207a5a4c6377c170 SHA512 a0df14dc129ec066636036859dd5b06a5258aa760698383f9ebb6242f25b1d588c49f00a291d6f4e9900a7c8eb17b5df664416f666fbce543d739008ac815181 DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345 -EBUILD bpftrace-0.11.4-r1.ebuild 1670 BLAKE2B 2ba970bb00da938ca92a88731498bcc4a8182578746b35e7d4341112c8f5abab0ec64921cbae14330b61f1c0e57b42f0c783db331da2bd9ce622a46450ccdc67 SHA512 9379627dc1e41f9134fddb8f2b6131afef0fd7d49c10f1ab746149e413ca61404e1fde9ec33200bd1148cc4f63832c921b19ac8c61ee4b5e6af34b09105f57ed -EBUILD bpftrace-0.11.4.ebuild 1617 BLAKE2B c7cc64ec9f9d2cb7254222edc3aec8622fa85dde47e316018f91af00ceecaca4837683b06763c8a30e4123097748afae38593853366f544544d7b217f47b6f92 SHA512 039d202fbf9dda331b71b89e06f47b7dbaf787a7f9d9ef39d5f2ea63fb7b9fb3734f7d145acb3f6d46d4acfa7ed594b305f99a57ef62fcfaafd88776fba1f493 +DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0 EBUILD bpftrace-0.12.1-r1.ebuild 1717 BLAKE2B b2e89c2456ab0dbdc38ce8fead1297cc4241a1f454fcc8d93fda913468b01f8f398155918089c5b2f7a91b8fde1d06e3c96ca126e4694d433b5624a62655aaef SHA512 9a28f395f250d80c001f34935e75667d39d2a80f07e4c4c37d9acb61707c5856bca560c70e1f5130a0c23aa2242b1ea3a6d2d8cf2f59418271bdccbcc69227ed -EBUILD bpftrace-9999.ebuild 1573 BLAKE2B 69c5ba3fc6278cd1b6098d174d8057c0ee758832a63716ff8864229deb35028d7ee5b738658cbb9787464391d250c35bf1933e0caf23fdbfc8d7f32422f86726 SHA512 aa783e719ee50be25065c696d291a1524b25949a43c78e9d7309cfbf5016ab413314a8575ac869bd45bb35fb9e251b0ea272f195b38cf1f20afb3b0783baacd7 +EBUILD bpftrace-0.13.0.ebuild 1717 BLAKE2B 983e2a0bab14db717143b9f3a43a0ed1f4424ad98cb77967f16d9dd97b968f4b4e4de98c41e5b9d33bef6f44ad52ce3ad004382471912b624950c871af38a750 SHA512 a2a27e804e0f851324ffcdb430f7278907fdac3056f186eb54ca8a1586991ba9fe52dd0c9b173b6b193ea2f6a2eb383f8af269b586c3b66eeda8a42cb905d5b4 MISC metadata.xml 384 BLAKE2B f15afc660256a07333c80974b7860af277b8e8d56a33c3d60e121399fe3e99f8260353bbcf44f53179829cdf8aeff1373c7ae6c8cbcfc1d4699046c6814ed10b SHA512 803c1e1c3f7e3a3a0e0e3510049385f81685fdcd4c5b6fcdf4244f476bd42861727389759a3de66493ad4d3f1c902b04a23406f119794995394858ff16983fa8 diff --git a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild deleted file mode 100644 index 76302016ee27..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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="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" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -# lots of fixing needed -RESTRICT="test" - -# https://bugs.gentoo.org/754648 -RESTRICT+=" strip" - -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.4.ebuild b/dev-util/bpftrace/bpftrace-0.11.4.ebuild deleted file mode 100644 index a3a1fb797011..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.4.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 - 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" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.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.13.0.ebuild b/dev-util/bpftrace/bpftrace-0.13.0.ebuild new file mode 100644 index 000000000000..3437f2e80ce1 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.13.0.ebuild @@ -0,0 +1,88 @@ +# 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.13.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) + ) + + cmake_src_configure +} diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild deleted file mode 100644 index 2a14dc584768..000000000000 --- a/dev-util/bpftrace/bpftrace-9999.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/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/files/bpftrace-0.11.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch deleted file mode 100644 index a28e37564eae..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bca8d6..1482b29 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,9 +91,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 487fa9b..61b7b38 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -84,7 +84,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 a26c1c8..ffb5900 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,13 +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) - 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 649bf0a..b969b9c 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 -@@ -7,17 +7,18 @@ add_library(ast - printer.cpp - semantic_analyser.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 -@@ -41,17 +42,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) -@@ -60,11 +61,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 4104a57..59486de 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -101,7 +101,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.13.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch new file mode 100644 index 000000000000..03fd2d13e602 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch @@ -0,0 +1,143 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e33bb1ca..52e1fa25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,9 +100,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 0361cdaa..f9c536a3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -49,6 +49,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) +@@ -109,7 +110,7 @@ if(STATIC_LINKING) + endif(STATIC_LINKING) + + +-target_link_libraries(libbpftrace parser resources ast arch) ++target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceast bpftracearch) + + if (LIBBPF_BTF_DUMP_FOUND) + target_include_directories(libbpftrace PUBLIC ${LIBBPF_INCLUDE_DIRS}) +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 5234388c..8b40faaa 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 +@@ -13,17 +13,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 +@@ -54,11 +55,11 @@ if (STATIC_LINKING) + + + if(EMBED_USE_LLVM) +- target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") ++ target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") + else() + llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names}) +- 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) +@@ -68,11 +69,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() -- cgit v1.2.3