mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-29 07:42:23 -05:00
07fbaa87e1
* gnu/packages/linux.scm (falcosecurity-libs): New variable. * gnu/packages/patches/falcosecurity-libs-install-pman.patch * gnu/packages/patches/falcosecurity-libs-libscap-pc.patch * gnu/packages/patches/falcosecurity-libs-pkg-config.patch * gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch * gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: I0cb15e6a25256598678fc20eb298ad947d699ef4
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
Fix shared library build.
|
|
Upstream status: https://github.com/falcosecurity/libs/pull/1842
|
|
|
|
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
|
|
index 80229cc03..70c9ba65b 100644
|
|
--- a/driver/CMakeLists.txt
|
|
+++ b/driver/CMakeLists.txt
|
|
@@ -152,6 +152,11 @@ set(DRIVER_SOURCES
|
|
ppm_consumer.h
|
|
capture_macro.h
|
|
socketcall_to_syscall.h
|
|
+ syscall_compat_loongarch64.h
|
|
+ syscall_compat_ppc64le.h
|
|
+ syscall_compat_riscv64.h
|
|
+ syscall_compat_s390x.h
|
|
+ syscall_compat_x86_64.h
|
|
syscall_ia32_64_map.c
|
|
)
|
|
|
|
diff --git a/test/libscap/CMakeLists.txt b/test/libscap/CMakeLists.txt
|
|
index e88603ebd..fa26ba7ee 100644
|
|
--- a/test/libscap/CMakeLists.txt
|
|
+++ b/test/libscap/CMakeLists.txt
|
|
@@ -45,6 +45,7 @@ set(LIBSCAP_TESTS_LIBRARIES
|
|
"${GTEST_LIB}"
|
|
"${GTEST_MAIN_LIB}"
|
|
"${CMAKE_THREAD_LIBS_INIT}"
|
|
+ "${PROTOBUF_LIB}"
|
|
scap
|
|
)
|
|
|
|
diff --git a/userspace/libscap/engine/gvisor/CMakeLists.txt b/userspace/libscap/engine/gvisor/CMakeLists.txt
|
|
index 6dfbafb14..875847b5d 100644
|
|
--- a/userspace/libscap/engine/gvisor/CMakeLists.txt
|
|
+++ b/userspace/libscap/engine/gvisor/CMakeLists.txt
|
|
@@ -76,6 +76,14 @@ if (BUILD_SHARED_LIBS)
|
|
add_dependencies(scap_engine_gvisor_o uthash)
|
|
add_dependencies(scap scap_engine_gvisor_o)
|
|
target_sources(scap PRIVATE $<TARGET_OBJECTS:scap_engine_gvisor_o>)
|
|
+
|
|
+ target_include_directories(scap_engine_gvisor_o
|
|
+ PRIVATE
|
|
+ ${CMAKE_BINARY_DIR}
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}
|
|
+ ${CMAKE_SOURCE_DIR}
|
|
+ ${CMAKE_SOURCE_DIR}/userspace
|
|
+ )
|
|
else()
|
|
add_library(scap_engine_gvisor
|
|
${scap_engine_gvisor_sources}
|