From 73e3365f8c2610a73035f5afd5286e31a20d088b Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Wed, 29 Sep 2021 13:09:43 +0200 Subject: [PATCH] Rename libbpf to libbcc_bpf as does upstream libbpf is reserved for kernel-provided library. Change-Id: I1d566b8c54b4d7bd9648885e89275754d1deacde --- packaging/bcc-tools.spec | 2 +- src/cc/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/bcc-tools.spec b/packaging/bcc-tools.spec index b0a65f29..a8fddf52 100644 --- a/packaging/bcc-tools.spec +++ b/packaging/bcc-tools.spec @@ -69,7 +69,7 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %files -%{_libdir}/libbpf.so +%{_libdir}/libbcc_bpf.so %{_libdir}/libbcc.so.* %{_prefix}/lib/python2.7/site-packages/bcc* %{_includedir}/bcc/hostcompat/* diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt index ad8c4312..f5ec3f65 100644 --- a/src/cc/CMakeLists.txt +++ b/src/cc/CMakeLists.txt @@ -20,9 +20,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") include(static_libstdc++) add_library(bpf-static STATIC libbpf.c perf_reader.c) -set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bpf) +set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf) add_library(bpf-shared SHARED libbpf.c perf_reader.c) -set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf) +set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf) set(bcc_common_sources bpf_common.cc bpf_module.cc exported_files.cc) set(bcc_table_sources table_storage.cc shared_table.cc bpffs_table.cc json_map_decl_visitor.cc) -- 2.34.1