From e3174fa72491dff2eec9a9c685aa1e52010034da Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 13 Jun 2018 20:19:19 -0300 Subject: [PATCH] bcc: update to 0.6.0. Closes #15136. Signed-off-by: Enno Boland --- srcpkgs/bcc/patches/llvm5.patch | 28 ---------------------------- srcpkgs/bcc/template | 4 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/bcc/patches/llvm5.patch diff --git a/srcpkgs/bcc/patches/llvm5.patch b/srcpkgs/bcc/patches/llvm5.patch deleted file mode 100644 index 7ed4d665563..00000000000 --- a/srcpkgs/bcc/patches/llvm5.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 4478cf20954..851fe5e8f46 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,6 +1,6 @@ # Template file for 'bcc' pkgname=bcc -version=0.5.0 +version=0.6.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=f3e2d79814d3b45c754450f5f4ab128050f8b3c95ce32f1c5e2c1ecbf364a321 +checksum=b69cf946a76bf8f6d0feaf2f92f045cbf1c3296b33e990f9fc7a6b9a1e548ca3 nocross=yes # https://github.com/voidlinux/void-packages/issues/4738 post_extract() {