mirror of
https://github.com/falcosecurity/falco.git
synced 2025-09-20 17:37:43 +00:00
build: gRPC link to bundled OpenSSL
Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
This commit is contained in:
@@ -35,7 +35,7 @@ else()
|
||||
URL "https://github.com/openssl/openssl/archive/OpenSSL_1_0_2n.tar.gz"
|
||||
URL_HASH "SHA256=4f4bc907caff1fee6ff8593729e5729891adcee412049153a3bb4db7625e8364"
|
||||
# END CHANGE for CVE-2017-3735, CVE-2017-3731, CVE-2017-3737, CVE-2017-3738, CVE-2017-3736
|
||||
CONFIGURE_COMMAND ./config shared --prefix=${OPENSSL_INSTALL_DIR}
|
||||
CONFIGURE_COMMAND ./config no-shared --prefix=${OPENSSL_INSTALL_DIR}
|
||||
BUILD_COMMAND ${CMD_MAKE}
|
||||
BUILD_IN_SOURCE 1
|
||||
INSTALL_COMMAND ${CMD_MAKE} install)
|
||||
|
@@ -116,11 +116,14 @@ 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
|
||||
HAS_SYSTEM_PROTOBUF=false
|
||||
HAS_SYSTEM_CARES=false
|
||||
HAS_EMBEDDED_OPENSSL_ALPN=false
|
||||
HAS_SYSTEM_OPENSSL_ALPN=true
|
||||
PKG_CONFIG_PATH=${OPENSSL_BUNDLE_DIR}
|
||||
PKG_CONFIG=${PKG_CONFIG_EXECUTABLE}
|
||||
PATH=${PROTOC_DIR}:$ENV{PATH}
|
||||
|
17
cmake/modules/patch/grpc.patch
Normal file
17
cmake/modules/patch/grpc.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
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
|
Reference in New Issue
Block a user