From 1164c639d6d3df00fc7429c59e82bc4ffb762795 Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 31 May 2021 18:05:27 +0200 Subject: [PATCH] fix(cmake/modules): avoid gRCP files to be installed into packages This patch is to be intended as a temporary workaround. The root issue needs to be addressed in `falcosecurity/libs`. A definite solution will be implemented later. Signed-off-by: Leonardo Grasso --- cmake/modules/falcosecurity-libs-repo/CMakeLists.txt | 2 +- .../modules/falcosecurity-libs-repo/patch/grpc.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 cmake/modules/falcosecurity-libs-repo/patch/grpc.patch diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt index 9506c70f..37b50568 100644 --- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt +++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt @@ -25,4 +25,4 @@ ExternalProject_Add( BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" - PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/luajit.patch) + PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/luajit.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/grpc.patch) diff --git a/cmake/modules/falcosecurity-libs-repo/patch/grpc.patch b/cmake/modules/falcosecurity-libs-repo/patch/grpc.patch new file mode 100644 index 00000000..0b118766 --- /dev/null +++ b/cmake/modules/falcosecurity-libs-repo/patch/grpc.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/grpc.cmake b/cmake/modules/grpc.cmake +index ffa4e6c4..346939b9 100644 +--- a/cmake/modules/grpc.cmake ++++ b/cmake/modules/grpc.cmake +@@ -125,6 +125,7 @@ else() + -DZLIB_ROOT:STRING=${ZLIB_SRC} + BUILD_IN_SOURCE 1 + BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} ${GPR_LIB} ${GRPC_LIBRARIES} ++ INSTALL_COMMAND DESTDIR=/ make install + ) + endif() + endif()