diff options
Diffstat (limited to 'dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch')
| -rw-r--r-- | dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch new file mode 100644 index 000000000000..8e0dfd606a16 --- /dev/null +++ b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch @@ -0,0 +1,52 @@ +diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c +index 452353a6..6eb7cd16 100644 +--- a/userspace/libscap/scap_fds.c ++++ b/userspace/libscap/scap_fds.c +@@ -49,6 +49,7 @@ limitations under the License. + #include <errno.h> + #include <netinet/tcp.h> + #if defined(__linux__) ++#include <sys/sysmacros.h> + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + //#include <linux/sock_diag.h> +diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt +index bc851319..ec454de7 100644 +--- a/userspace/libsinsp/CMakeLists.txt ++++ b/userspace/libsinsp/CMakeLists.txt +@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES}) + + target_link_libraries(sinsp + scap +- "${JSONCPP_LIB}") ++ "${CURL_LIBRARIES}" ++ "${JSONCPP_LIB}" ++ "${TBB_LIB}") + + if(USE_BUNDLED_LUAJIT) + add_dependencies(sinsp luajit) +@@ -157,13 +159,12 @@ if(NOT WIN32) + endif() + if(USE_BUNDLED_CURL) + add_dependencies(sinsp curl) +- target_link_libraries(sinsp +- "${CURL_LIBRARIES}") + endif() + if(USE_BUNDLED_TBB) + add_dependencies(sinsp tbb) +- target_link_libraries(sinsp +- "${TBB_LIB}") ++ endif() ++ if(USE_BUNDLED_GRPC) ++ add_dependencies(sinsp grpc) + endif() + + if(NOT APPLE) +@@ -177,7 +178,6 @@ if(NOT WIN32) + COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + +- add_dependencies(sinsp grpc) + target_link_libraries(sinsp + "${GRPCPP_LIB}" + "${GRPC_LIB}" |