From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- dev-util/bpftrace/Manifest | 5 +- dev-util/bpftrace/bpftrace-0.9-r1.ebuild | 60 +++++++++++++++++++++++ dev-util/bpftrace/bpftrace-0.9.ebuild | 58 ---------------------- dev-util/bpftrace/bpftrace-9999.ebuild | 8 +-- dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch | 30 ++++++++++++ 5 files changed, 98 insertions(+), 63 deletions(-) create mode 100644 dev-util/bpftrace/bpftrace-0.9-r1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.9.ebuild create mode 100644 dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch (limited to 'dev-util/bpftrace') diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index d0120253ffbf..7630aab1bc2b 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,6 +1,7 @@ +AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b04e1ee5c14db76c62490f6b487ddb06465be16df4fda7cc92e2cfa1d97129e7e1e852a26468e24f8059314f13a6 SHA512 4067aee17715312cf49dc3510754d6aaaa4dba25dfb802dc434d068bf5f35135aca2c107b2463044e5f88890ac20c1ba97eff604616913f5246c57eda3aed7ee AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8 -EBUILD bpftrace-0.9.ebuild 1190 BLAKE2B 54b1634249e4594ea5115c87047e74e4f73c1b48e24f51292ed8dbb5f554cae84c8d18f70e1cd1c73b9f3120c670ecc94833f7d7f62c3efd4a43fa8c8b6bb783 SHA512 6a36f394710b5c027b0ae6b040c956e4891c17294cbb1e913152a592d46b1b694fa3dbf102ab8e555486b165764e0c7cf30fad79f8663be9b1d7cd3b1040ca3c -EBUILD bpftrace-9999.ebuild 1233 BLAKE2B 493490aea8b690eb3d86ad875462602b40552a9ef4713ffcf733550bf30fd6b16f33b8847f670e26c3c2245b2a5f10d888bcfaa7869b868cb126d428994f6e88 SHA512 355f550827610fce8cf8a51561bdce9b56e5b00f5d49c5b0d31dabe93307be754011d93d1ad9cbe2f140950d51d9f9ec77a44ab9fa8130c863b598eb98e00e9b +EBUILD bpftrace-0.9-r1.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6 +EBUILD bpftrace-9999.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild new file mode 100644 index 000000000000..393a086df3b7 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs 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 ~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" + +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.ebuild b/dev-util/bpftrace/bpftrace-0.9.ebuild deleted file mode 100644 index b483aed0116a..000000000000 --- a/dev-util/bpftrace/bpftrace-0.9.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs 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 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -COMMON_DEPEND="sys-devel/clang:= - >=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" -) - -# lots of fixing needed -RESTRICT="test" - -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-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild index 1f874815e93c..393a086df3b7 100644 --- a/dev-util/bpftrace/bpftrace-9999.ebuild +++ b/dev-util/bpftrace/bpftrace-9999.ebuild @@ -13,8 +13,7 @@ if [[ ${PV} =~ 9{4,} ]]; then EGIT_REPO_URI="https://github.com/iovisor/${PN}" BDEPEND="" else - SRC_URI="mirror://gentoo/${P}.tar.xz" - #SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" BDEPEND="app-arch/xz-utils " fi @@ -24,6 +23,7 @@ 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" @@ -34,10 +34,12 @@ BDEPEND+="dev-util/cmake sys-devel/flex sys-devel/bison" +QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" + PATCHES=( - "${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch" "${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch" "${FILESDIR}/bpftrace-mandir.patch" + "${FILESDIR}/bpftrace-0.9-llvm-8.patch" ) # lots of fixing needed diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch new file mode 100644 index 000000000000..14d6a167a863 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch @@ -0,0 +1,30 @@ +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 TM; + std::shared_ptr Resolver; ++#if LLVM_VERSION_MAJOR >= 8 ++ LegacyRTDyldObjectLinkingLayer ObjectLayer; ++ LegacyIRCompileLayer CompileLayer; ++#else + RTDyldObjectLinkingLayer ObjectLayer; + IRCompileLayer CompileLayer; ++#endif + + public: + std::map> 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(sections_), Resolver}; }), ++#else + ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared(sections_), Resolver}; }), ++#endif + CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {} + + void compileModule(std::unique_ptr M) { -- cgit v1.2.3