diff --git a/bcc-src-with-submodule.tar.gz b/bcc-src-with-submodule.tar.gz index 16136cf04124a92289146617c758adfcd20f55b1..84f6f1e6dc05df6005cf1f27d52c81524e90ac57 100644 Binary files a/bcc-src-with-submodule.tar.gz and b/bcc-src-with-submodule.tar.gz differ diff --git a/bcc.spec b/bcc.spec index dc2b7aec5a9b49933070e68b5fe72af1232cdf89..1b2e915b3bb09977353b6278e3cec031486979bf 100644 --- a/bcc.spec +++ b/bcc.spec @@ -1,6 +1,8 @@ +%bcond_without llvm_shared + Name: bcc -Version: 0.23.0 -Release: 2 +Version: 0.26.0 +Release: 1 Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc @@ -13,14 +15,12 @@ Source0: %{url}/releases/download/v%{version}/%{name}-src-with-submodule. BuildRequires: bison cmake >= 2.8.7 flex libxml2-devel python3-devel BuildRequires: elfutils-libelf-devel llvm-devel clang-devel BuildRequires: llvm-static ncurses-devel pkgconfig(luajit) -BuildRequires: libbpf-devel >= 0.0.5-3, libbpf-static >= 0.0.5-3 +BuildRequires: libbpf-devel >= 0.8.0-1, libbpf-static >= 0.8.0-1 # Additional dependency on util-linux for 'rename' BuildRequires: util-linux Requires: %{name}-tools = %{version}-%{release} -Requires: libbpf >= 0.0.5-3 - -Patch0001: dynamic-link-bcc-against-llvm.patch +Requires: libbpf >= 0.8.0-1 %description BCC is a toolkit for creating efficient kernel tracing and manipulation @@ -161,6 +161,12 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Thu Feb 2 2023 JofDiamonds - 0.26.0-1 +- upgrade bcc from 0.23.0 to 0.26.0 + +* Thu Dec 15 2022 Qiang Wei - 0.23.0-3 +- Use conditonal build to enable with_llvm_shared option + * Tue Oct 25 2022 liuchao - 0.23.0-2 - remove cpuload diff --git a/dynamic-link-bcc-against-llvm.patch b/dynamic-link-bcc-against-llvm.patch deleted file mode 100644 index e88a1e5d634c9f7cf79ce4ab647b2197a128440a..0000000000000000000000000000000000000000 --- a/dynamic-link-bcc-against-llvm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 35452990a25ddc3a4dce51c89d1c3ea7cee9e663 Mon Sep 17 00:00:00 2001 -From: sunsuwan -Date: Fri, 4 Mar 2022 09:44:20 +0800 -Subject: [PATCH] dynamic link bcc against llvm - -Signed-off-by: sunsuwan sunsuwan2@huawei.com ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e33856c..fb3352e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,7 +57,7 @@ include(cmake/FindCompilerFlag.cmake) - - option(ENABLE_LLVM_NATIVECODEGEN "Enable use of llvm nativecodegen module (needed by rw-engine)" ON) - option(ENABLE_RTTI "Enable compiling with real time type information" OFF) --option(ENABLE_LLVM_SHARED "Enable linking LLVM as a shared library" OFF) -+option(ENABLE_LLVM_SHARED "Enable linking LLVM as a shared library" ON) - option(ENABLE_CLANG_JIT "Enable Loading BPF through Clang Frontend" ON) - option(ENABLE_USDT "Enable User-level Statically Defined Tracing" ON) - option(ENABLE_EXAMPLES "Build examples" ON) --- -2.27.0 -