From 574c1268b03f2dea1bca5d5a7611acc450fd77d2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 30 Nov 2017 12:39:08 +0100 Subject: [PATCH] bcc: update to 0.5.0. --- srcpkgs/bcc/patches/llvm5.patch | 28 ++++++++++++++++++++++++++++ srcpkgs/bcc/template | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/bcc/patches/llvm5.patch diff --git a/srcpkgs/bcc/patches/llvm5.patch b/srcpkgs/bcc/patches/llvm5.patch new file mode 100644 index 00000000000..7ed4d665563 --- /dev/null +++ b/srcpkgs/bcc/patches/llvm5.patch @@ -0,0 +1,28 @@ +--- cmake/clang_libs.cmake.orig ++++ cmake/clang_libs.cmake +@@ -8,7 +8,7 @@ + if (${_llvm_coroutines} GREATER -1) + list(APPEND llvm_raw_libs coroutines) + endif() +-if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5") ++if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "6") + list(APPEND llvm_raw_libs bpfasmparser) + list(APPEND llvm_raw_libs bpfdisassembler) + endif() +--- src/cc/bcc_debug.cc.orig ++++ src/cc/bcc_debug.cc +@@ -48,6 +48,7 @@ + using namespace llvm; + using DWARFLineTable = DWARFDebugLine::LineTable; + ++#if 0 + void SourceDebugger::adjustInstSize(uint64_t &Size, uint8_t byte0, + uint8_t byte1) { + #ifdef WORKAROUND_FOR_LD_PSEUDO +@@ -215,5 +216,6 @@ + src_dbg_fmap_[func_name] = src_dbg_str; + } + } ++#endif + + } // namespace ebpf diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index db0bcb53a35..4478cf20954 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,6 +1,6 @@ # Template file for 'bcc' pkgname=bcc -version=0.4.0 +version=0.5.0 revision=1 build_style=cmake configure_args="-DREVISION=${version}" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/iovisor/bcc" distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz" -checksum=f77dd07262e8365e48589bf0475e3248e4e77deae0f90e4fb77af26255bce87d +checksum=f3e2d79814d3b45c754450f5f4ab128050f8b3c95ce32f1c5e2c1ecbf364a321 nocross=yes # https://github.com/voidlinux/void-packages/issues/4738 post_extract() {