diff --git a/cmake/modules/gRPC.cmake b/cmake/modules/gRPC.cmake index ff223b2a..e863710c 100644 --- a/cmake/modules/gRPC.cmake +++ b/cmake/modules/gRPC.cmake @@ -116,7 +116,6 @@ else() BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} INSTALL_COMMAND "" CONFIGURE_COMMAND "" - PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/patch/grpc.patch BUILD_COMMAND CFLAGS=-Wno-implicit-fallthrough HAS_SYSTEM_ZLIB=false diff --git a/cmake/modules/patch/grpc.patch b/cmake/modules/patch/grpc.patch deleted file mode 100644 index 46214aa6..00000000 --- a/cmake/modules/patch/grpc.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Makefile b/Makefile -index dd4ced8112..795f499137 100644 ---- a/Makefile -+++ b/Makefile -@@ -786,11 +786,10 @@ endif # EMBED_OPENSSL - endif # NO_SECURE - - ifeq ($(OPENSSL_PKG_CONFIG),true) --LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl) -+LDLIBS_SECURE += $(shell $(PKG_CONFIG) --static --libs openssl) - else - LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE)) - endif -- - # gpr .pc file - PC_NAME = gpr - PC_DESCRIPTION = gRPC platform support library diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index e45f1e43..7704840f 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -75,6 +75,7 @@ target_include_directories( "${STRING_VIEW_LITE_INCLUDE}" "${YAMLCPP_INCLUDE_DIR}" "${CIVETWEB_INCLUDE_DIR}" + "${OPENSSL_INCLUDE_DIR}" "${GRPC_INCLUDE}" "${GRPCPP_INCLUDE}" "${PROTOBUF_INCLUDE}" @@ -89,6 +90,8 @@ target_link_libraries( "${GRPC_LIB}" "${GRPCPP_LIB}" "${PROTOBUF_LIB}" + "${OPENSSL_LIBRARY_SSL}" + "${OPENSSL_LIBRARY_CRYPTO}" "${LIBYAML_LIB}" "${YAMLCPP_LIB}" "${CIVETWEB_LIB}")