sync with latest libbpf

also add dependency of zlib in a couple of places as libbpf starts to use zlib directly. Signed-off-by: Yonghong Song <yhs@fb.com>
iovisor · Dec 21, 2019 · 8174c0a · 8174c0a
1 parent b2aa29f
commit 8174c0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
@@ -8,6 +8,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
 option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON)
 
 add_executable(bps bps.c)
-target_link_libraries(bps bpf-static elf)
+target_link_libraries(bps bpf-static elf z)
 
 install (TARGETS bps DESTINATION share/bcc/introspection)
diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
@@ -91,7 +91,7 @@ if(ENABLE_USDT)
 endif()
 
 add_library(bcc-loader-static STATIC ${bcc_sym_sources} ${bcc_util_sources})
-target_link_libraries(bcc-loader-static elf)
+target_link_libraries(bcc-loader-static elf z)
 add_library(bcc-static STATIC
   ${bcc_common_sources} ${bcc_table_sources} ${bcc_util_sources} ${bcc_usdt_sources} ${bcc_sym_sources} ${bcc_util_sources})
 set_target_properties(bcc-static PROPERTIES OUTPUT_NAME bcc)

diff --git a/src/cc/libbpf b/src/cc/libbpf