Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename libbpf.{a,so} to libbcc_bpf.{a,so} #2290

Merged
merged 1 commit into from
Mar 27, 2019
Merged

rename libbpf.{a,so} to libbcc_bpf.{a,so} #2290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <[email protected]>
  • Loading branch information
@yonghong-song
yonghong-song committed Mar 27, 2019
commit 84911536d32fbb8a654ddb0110bca1eb4f4589f7
4 changes: 2 additions & 2 deletions src/cc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down