From fd4047b541e7a63ef07c631c99d24ce384f01f40 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Tue, 13 Dec 2022 08:55:56 +0800
Subject: [PATCH] Sync 22.03-LTS release to 22.03 branch

---
 bcc.spec                            | 13 ++++++++++++-
 dynamic-link-bcc-against-llvm.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 dynamic-link-bcc-against-llvm.patch

diff --git a/bcc.spec b/bcc.spec
index 036895f..6478105 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -1,6 +1,6 @@
 Name:           bcc
 Version:        0.23.0
-Release:        0
+Release:        3
 Summary:        BPF Compiler Collection (BCC)
 License:        ASL 2.0
 URL:            https://github.com/iovisor/bcc
@@ -20,6 +20,8 @@ BuildRequires:  util-linux
 Requires:       %{name}-tools = %{version}-%{release}
 Requires:       libbpf >= 0.0.5-3
 
+Patch6000: dynamic-link-bcc-against-llvm.patch
+
 %description
 BCC is a toolkit for creating efficient kernel tracing and manipulation
 programs, and includes several useful tools and examples. It makes use of
@@ -159,6 +161,15 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
 
 
 %changelog
+* Tue Oct 25 2022 liuchao <liuchao173@huawei.com> - 0.23.0-3
+- remove cpuload
+
+* Tue Mar 29 2022 sunsuwan <sunsuwan2@huawei.com> - 0.23.0-2
+- add tool:cpuload
+
+* Fri Mar 04 2022 sunsuwan <sunsuwan2@huawei.com> - 0.23.0-1
+- bugfix: dynamic link bcc against llvm
+
 * Tue Dec 28 2021 sunsuwan <sunsuwan2@huawei.com> - 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 0000000..e88a1e5
--- /dev/null
+++ b/dynamic-link-bcc-against-llvm.patch
@@ -0,0 +1,26 @@
+From 35452990a25ddc3a4dce51c89d1c3ea7cee9e663 Mon Sep 17 00:00:00 2001
+From: sunsuwan <sunsuwan2@huawei.com>
+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
+
-- 
Gitee