From 84911536d32fbb8a654ddb0110bca1eb4f4589f7 Mon Sep 17 00:00:00 2001 From: Yonghong Song Date: Tue, 26 Mar 2019 22:16:15 -0700 Subject: [PATCH] rename libbpf.{a,so} to libbcc_bpf.{a,so} This is based on discussion in netdev regarding to libbpf repo packaging: https://lore.kernel.org/bpf/20190325202009.GA14511@krava/T/#t The libbpf repo https://github.com/libbpf/libbpf contains the linux:tools/lib/bpf codes plus some other uapi and auxiliary headers. It is natural for libbpf repo to generate a libbpf.{a,so} installable as a package. To avoid conflicts, let us rename bcc libbpf.{a,so} to libbcc_bpf.{a,so}. Signed-off-by: Yonghong Song --- src/cc/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt index 59a598560e4c..1c3df632ca5a 100644 --- a/src/cc/CMakeLists.txt +++ b/src/cc/CMakeLists.txt @@ -30,10 +30,10 @@ include(static_libstdc++) file(GLOB libbpf_sources "libbpf/src/*.c") add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources}) -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 ${libbpf_sources}) set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0) -set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf) +set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf) set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc) if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)