Add libbpf dependency

Author: mszabo-wikia

CMake/FindBpf.cmake

@@ -0,0 +1,15 @@
+find_path(BPF_INCLUDE_DIR bpf/bpf.h)
+find_library(BPF_LIBRARY NAMES bpf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BPF DEFAULT_MSG BPF_LIBRARY BPF_INCLUDE_DIR)
+
+if(BPF_FOUND)
+  set(BPF_LIBRARIES ${BPF_LIBRARY})
+  set(BPF_INCLUDE_DIRS ${BPF_INCLUDE_DIR})
+else()
+  set(BPF_LIBRARIES)
+  set(BPF_INCLUDE_DIRS)
+endif()
+
+mark_as_advanced(BPF_LIBRARIES BPF_INCLUDE_DIRS)

CMake/HPHPFindLibs.cmake

@@ -44,8 +44,8 @@ include_directories(${LIBEVENT_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES "${LIBEVENT_LIB}")
 CHECK_FUNCTION_EXISTS("evhttp_bind_socket_with_fd" HAVE_CUSTOM_LIBEVENT)
 if(HAVE_CUSTOM_LIBEVENT)
-        message("Using custom LIBEVENT")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_CUSTOM_LIBEVENT")
+  message("Using custom LIBEVENT")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_CUSTOM_LIBEVENT")
 endif()
 set(CMAKE_REQUIRED_LIBRARIES)
 
@@ -280,6 +280,7 @@ endif()
 
 if (LINUX)
   find_package(LibUnwind REQUIRED)
+  find_package(Bpf REQUIRED)
 endif()
 
 # This is required by Homebrew's libc. See
@@ -344,7 +345,7 @@ macro(hphp_link target)
   target_link_libraries(${target} ${VISIBILITY} glog)
 
   if (LINUX)
-    target_link_libraries(${target} ${VISIBILITY} ${LIBUNWIND_LIBRARIES})
+    target_link_libraries(${target} ${VISIBILITY} ${LIBUNWIND_LIBRARIES} ${BPF_LIBRARIES})
   endif()
 
   if (LIBINOTIFY_LIBRARY)
@@ -453,9 +454,9 @@ macro(hphp_link target)
 
   if (ENABLE_XED)
     if (LibXed_FOUND)
-        target_link_libraries(${target} ${VISIBILITY} ${LibXed_LIBRARY})
+      target_link_libraries(${target} ${VISIBILITY} ${LibXed_LIBRARY})
     else()
-        target_link_libraries(${target} ${VISIBILITY} xed)
+      target_link_libraries(${target} ${VISIBILITY} xed)
     endif()
   endif()
 

ci/ubuntu-24.04-noble/debian/control

@@ -19,6 +19,7 @@ Build-Depends:
   git,
   gperf,
   libboost-all-dev,
+  libbpf-dev,
   libbz2-dev,
   libc-client-dev,
   libc-client2007e-dev,