Upstream status: https://github.com/draios/sysdig/pull/2093 diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 7cee8a3c4..dd59c1b32 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -16,6 +16,19 @@ # limitations under the License. # +option(USE_BUNDLED_FALCOSECURITY_LIBS "Enable building of the bundled falcosecurity libraries" ${USE_BUNDLED_DEPS}) + +if(NOT USE_BUNDLED_FALCOSECURITY_LIBS) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBSINSP REQUIRED IMPORTED_TARGET libsinsp) + message(STATUS "Found libsinsp: + include: ${LIBSINSP_INCLUDE_DIRS} + lib: ${LIBSINSP_LIBRARIES} + cflags: ${LIBSINSP_CFLAGS}") + return() +endif() + +# else(): using bundled falcosecurity libs set(FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/falcosecurity-libs-repo") set(FALCOSECURITY_LIBS_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/falcosecurity-libs-repo") diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt index 60f8072ad..0cb179ccc 100644 --- a/userspace/sysdig/CMakeLists.txt +++ b/userspace/sysdig/CMakeLists.txt @@ -20,7 +20,6 @@ if(NOT WIN32) include(ncurses) endif() # NOT WIN32 -include(zlib) include(luajit) include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui") @@ -84,6 +83,12 @@ if(USE_BUNDLED_DEPS) add_dependencies(csysdig luajit) endif() +if(USE_BUNDLED_FALCOSECURITY_LIBS) + set(SINSP_LIB sinsp) +else() + set(SINSP_LIB PkgConfig::LIBSINSP) +endif() + target_include_directories( sysdig PUBLIC @@ -108,7 +113,7 @@ if(NOT WIN32) include_directories(${PROJECT_BINARY_DIR}/driver/src) target_link_libraries(sysdig - sinsp + "${SINSP_LIB}" "${LUAJIT_LIB}" "${YAMLCPP_LIB}") @@ -117,7 +122,7 @@ if(NOT WIN32) endif() target_link_libraries(csysdig - sinsp + "${SINSP_LIB}" "${LUAJIT_LIB}" "${CURSES_LIBRARIES}" "${YAMLCPP_LIB}") @@ -140,12 +145,12 @@ else() add_definitions(-DNOCURSESUI) target_link_libraries(sysdig - sinsp + "${SINSP_LIB}" "${LUAJIT_LIB}" "${YAMLCPP_LIB}") target_link_libraries(csysdig - sinsp + "${SINSP_LIB}" "${LUAJIT_LIB}" "${YAMLCPP_LIB}") 48bcb76bc5302994a1f974612122c259&showmsg=1'>Expand)Author 2024-08-05Change email of Evgeny Pisemsky....* .mailmap: Add entry to Evgeny Pisemsky. * gnu/packages/emacs-xyz.scm, gnu/packages/engineering.scm, gnu/packages/guile-xyz.scm, gnu/packages/hardware.scm, gnu/packages/perl.scm, gnu/packages/python-xyz.scm, gnu/packages/sdl.scm, gnu/packages/web.scm: Adjust copyright line. Change-Id: I9a10be1ee7cc164f18d826b51348ee26eee2ca4b Signed-off-by: Efraim Flashner <efraim@flashner.co.il> Evgeny Pisemsky 2024-01-07Update mailmap....* .mailmap: Add entry for Tomas Volf. Change-Id: I0a8b43b3b7f71c3020f96118adcbad8937a290fb Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Tomas Volf 2023-08-16Update email addresses for Juliana Sims....* .mailmap: Add an entry for Juliana. * gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/build-tools.scm, gnu/packages/scheme.scm: Update Juliana's email. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Juliana Sims 2022-01-11Update mailmap....* .mailmap: Add entry for Zheng Junjie. Leo Famulari 2021-11-06Update mailmap and copyright assignments for Liliana Marie Prikler....Use full names everywhere. * .mailmap: Use full name for Liliana Marie Prikler. * gnu/packages/zig.scm: Likewise. Liliana Marie Prikler 2021-09-06Update mailmap....* .mailmap: Add entry for Liliana Marie Prikler. Liliana Marie Prikler 2021-09-04Update mailmap....* .mailmap: Alias all my contributions to the same identity. Marius Bakke 2021-07-27Update mailmap....* .mailmap: Add entry for Christine Lemmer-Webber. Leo Famulari 2021-07-08mailmap: Update entries for Matthew James Kraai....* .mailmap: Change name for Matthew James Kraai. * gnu/packages/lisp-xyz.scm, gnu/packages/python-xyz.scm, gnu/packages/rust.scm: Likewise. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Matthew James Kraai 2021-06-23gnu: Add Sollya....* gnu/packages/algebra.scm (sollya): New variable. * .mailmap: Adjust "proper email" for `git commit`. Eric Bavier 2021-04-21Update email address for Kei....* .mailmap: Remove obsolete email for Kei. Kei Kebreau