build: include openssl libraries in falco

Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
This commit is contained in:
Lorenzo Fontana 2020-08-17 19:37:29 +02:00 committed by poiana
parent 59b2bdac9d
commit feb39010bb
3 changed files with 3 additions and 18 deletions

View File

@ -116,7 +116,6 @@ else()
BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB}
INSTALL_COMMAND "" INSTALL_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/patch/grpc.patch
BUILD_COMMAND BUILD_COMMAND
CFLAGS=-Wno-implicit-fallthrough CFLAGS=-Wno-implicit-fallthrough
HAS_SYSTEM_ZLIB=false HAS_SYSTEM_ZLIB=false

View File

@ -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

View File

@ -75,6 +75,7 @@ target_include_directories(
"${STRING_VIEW_LITE_INCLUDE}" "${STRING_VIEW_LITE_INCLUDE}"
"${YAMLCPP_INCLUDE_DIR}" "${YAMLCPP_INCLUDE_DIR}"
"${CIVETWEB_INCLUDE_DIR}" "${CIVETWEB_INCLUDE_DIR}"
"${OPENSSL_INCLUDE_DIR}"
"${GRPC_INCLUDE}" "${GRPC_INCLUDE}"
"${GRPCPP_INCLUDE}" "${GRPCPP_INCLUDE}"
"${PROTOBUF_INCLUDE}" "${PROTOBUF_INCLUDE}"
@ -89,6 +90,8 @@ target_link_libraries(
"${GRPC_LIB}" "${GRPC_LIB}"
"${GRPCPP_LIB}" "${GRPCPP_LIB}"
"${PROTOBUF_LIB}" "${PROTOBUF_LIB}"
"${OPENSSL_LIBRARY_SSL}"
"${OPENSSL_LIBRARY_CRYPTO}"
"${LIBYAML_LIB}" "${LIBYAML_LIB}"
"${YAMLCPP_LIB}" "${YAMLCPP_LIB}"
"${CIVETWEB_LIB}") "${CIVETWEB_LIB}")