Prevent ebpfpub linking against the system zlib

Update the ebpfpub version so that's possible to specify to link against the osquery compiled zlib static library, instead of linking against the system one.
osquery · Apr 11, 2022 · dcb6323 · dcb6323
1 parent d81b8e4
commit dcb6323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libraries/cmake/source/ebpfpub/CMakeLists.txt b/libraries/cmake/source/ebpfpub/CMakeLists.txt
@@ -20,10 +20,16 @@ function(ebpfpubLibraryMain)
     unset(EBPF_COMMON_TOOLCHAIN_PATH CACHE)
   endif()
 
+  get_target_property(zlib_library_folder thirdparty_zlib BINARY_DIR)
+  set(EBPF_COMMON_ZLIB_LIBRARY_PATH "${zlib_library_folder}/libthirdparty_zlib.a")
+
   add_subdirectory("src" EXCLUDE_FROM_ALL)
 
   target_link_libraries(ebpfpub PRIVATE thirdparty_cxx_settings)
   add_library(thirdparty_ebpfpub ALIAS ebpfpub)
+
+  # Ensure zlib is built before ebpfpub
+  add_dependencies(ebpfpub thirdparty_zlib)
 endfunction()
 
 ebpfpubLibraryMain()
diff --git a/libraries/cmake/source/ebpfpub/src b/libraries/cmake/source/ebpfpub/src
+1 −1		.github/workflows/main.yml
+1 −1		libraries/ebpf-common/src