diff --git a/bcc-src-with-submodule.tar.gz b/bcc-src-with-submodule.tar.gz index 16136cf04124a92289146617c758adfcd20f55b1..58b2d3dd7ad64be9d66de35eb9d6eb48a57f7feb 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 96b8a15ac6a1e6386d1e777856b4b3bed12a92a6..08228fb9b91da3ce4ad5dd685c047efa4722f571 100644 --- a/bcc.spec +++ b/bcc.spec @@ -1,6 +1,10 @@ Name: bcc +<<<<<<< HEAD +Version: 0.24.0 +======= Version: 0.23.0 -Release: 0 +>>>>>>> a1d1134 (dynamic link bcc against llvm) +Release: 1 Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc @@ -20,6 +24,7 @@ BuildRequires: util-linux Requires: %{name}-tools = %{version}-%{release} Requires: libbpf >= 0.0.5-3 +Patch0001: dynamic-link-bcc-against-llvm.patch Patch9000: add-tool-cpuload.patch %description @@ -161,6 +166,14 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +<<<<<<< HEAD +* Thu Jul 28 2022 hkgy - 0.24.0-1 +- update to 0.24.0 +======= +* Sat Jul 30 2022 yaoxin - 0.23.0-1 +- bugfix: dynamic link bcc against llvm +>>>>>>> a1d1134 (dynamic link bcc against llvm) + * Mon Dec 27 2021 sunsuwan - 0.23.0-0 - update bcc from 0.15.0 to 0.23.0 diff --git a/dynamic-link-bcc-against-llvm.patch b/dynamic-link-bcc-against-llvm.patch new file mode 100644 index 0000000000000000000000000000000000000000..e88a1e5d634c9f7cf79ce4ab647b2197a128440a --- /dev/null +++ b/dynamic-link-bcc-against-llvm.patch @@ -0,0 +1,26 @@ +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 +