github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-02 01:22:16 +00:00
Code Issues Projects Releases Wiki Activity

build(cmake): fix sysdig and gRPC dependencies for gcc8

Browse Source 
Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com>
Signed-off-by: Lorenzo Fontana <lo@linux.com>
This commit is contained in:
Lorenzo Fontana 2020-01-17 14:47:37 +01:00 committed by Leo Di Donato
parent 9a3c98d93b
commit df0539ddb0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -54,13 +54,13 @@ set(CMAKE_COMMON_FLAGS "-Wall -ggdb ${DRAIOS_FEATURE_FLAGS}")
if(BUILD_WARNINGS_AS_ERRORS) if(BUILD_WARNINGS_AS_ERRORS)
set(CMAKE_SUPPRESSED_WARNINGS set(CMAKE_SUPPRESSED_WARNINGS
"-Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable -Wno-missing-field-initializers -Wno-sign-compare -Wno-type-limits -Wno-implicit-fallthrough -Wno-format-truncation" "-Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable -Wno-missing-field-initializers -Wno-sign-compare -Wno-type-limits -Wno-implicit-fallthrough -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-restrict"
) )
set(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS} -Wextra -Werror ${CMAKE_SUPPRESSED_WARNINGS}") set(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS} -Wextra -Werror ${CMAKE_SUPPRESSED_WARNINGS}")
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_COMMON_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_COMMON_FLAGS}")
set(CMAKE_CXX_FLAGS "--std=c++0x ${CMAKE_COMMON_FLAGS}") set(CMAKE_CXX_FLAGS "--std=c++0x ${CMAKE_COMMON_FLAGS} -Wno-class-memaccess")
set(CMAKE_C_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}") set(CMAKE_C_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}")

10
cmake/modules/gRPC.cmake
View File

@ -88,14 +88,14 @@ else()
STATUS STATUS
"Bundled gRPC comes with ---> protobuf: compiler: ${PROTOC}, include: ${PROTOBUF_INCLUDE}, lib: ${PROTOBUF_LIB}") "Bundled gRPC comes with ---> protobuf: compiler: ${PROTOC}, include: ${PROTOBUF_INCLUDE}, lib: ${PROTOBUF_LIB}")
message(STATUS "Bundled gRPC comes with ---> zlib: include: ${ZLIB_INCLUDE}, lib: ${ZLIB_LIB}}") message(STATUS "Bundled gRPC comes with ---> zlib: include: ${ZLIB_INCLUDE}, lib: ${ZLIB_LIB}}")
message(STATUS "Bundled gRPC comes with ---> grpC cpp plugin: include: ${GRPC_CPP_PLUGIN}") message(STATUS "Bundled gRPC comes with ---> gRPC cpp plugin: include: ${GRPC_CPP_PLUGIN}")
get_filename_component(PROTOC_DIR ${PROTOC} PATH) get_filename_component(PROTOC_DIR ${PROTOC} PATH)
ExternalProject_Add( ExternalProject_Add(
grpc grpc
GIT_REPOSITORY https://github.com/grpc/grpc.git GIT_REPOSITORY https://github.com/grpc/grpc.git
GIT_TAG v1.8.1 GIT_TAG v1.26.0
GIT_SUBMODULES "third_party/protobuf third_party/zlib third_party/cares/cares" GIT_SUBMODULES "third_party/protobuf third_party/zlib third_party/cares/cares"
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB}
@ -105,10 +105,10 @@ else()
CFLAGS=-Wno-implicit-fallthrough CFLAGS=-Wno-implicit-fallthrough
HAS_SYSTEM_ZLIB=false HAS_SYSTEM_ZLIB=false
HAS_SYSTEM_PROTOBUF=false HAS_SYSTEM_PROTOBUF=false
LDFLAGS=-static HAS_SYSTEM_CARES=false
PATH=${PROTOC_DIR}:$ENV{PATH} PATH=${PROTOC_DIR}:$ENV{PATH}
make make
grpc_cpp_plugin
static_cxx static_cxx
static_c) static_c
grpc_cpp_plugin)
endif() endif()