From 06c24b68a8ec5613ec9345d32353232cad3b2366 Mon Sep 17 00:00:00 2001 From: Qiang Wei Date: Thu, 15 Dec 2022 11:57:58 +0800 Subject: [PATCH] Use conditonal build to enable with_llvm_shared option Signed-off-by: Qiang Wei --- bcc.spec | 9 ++++++--- dynamic-link-bcc-against-llvm.patch | 26 -------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 dynamic-link-bcc-against-llvm.patch diff --git a/bcc.spec b/bcc.spec index 6478105..493e3ed 100644 --- a/bcc.spec +++ b/bcc.spec @@ -1,6 +1,8 @@ +%bcond_without llvm_shared + Name: bcc Version: 0.23.0 -Release: 3 +Release: 4 Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc @@ -20,8 +22,6 @@ 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 @@ -161,6 +161,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Thu Dec 15 2022 Qiang Wei - 0.23.0-4 +- Use conditonal build to enable with_llvm_shared option + * Tue Oct 25 2022 liuchao - 0.23.0-3 - remove cpuload diff --git a/dynamic-link-bcc-against-llvm.patch b/dynamic-link-bcc-against-llvm.patch deleted file mode 100644 index e88a1e5..0000000 --- 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 - -- Gitee