From 6ab27683faaf73160f065bb9cc1e22c03ebeacde Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Mon, 20 Jan 2020 22:03:14 +0000 Subject: [PATCH] fix(cmake/modules): no need of LDFLAGS=-static for gRPC cmake Co-authored-by: Lorenzo Fontana Signed-off-by: Leonardo Di Donato --- cmake/modules/gRPC.cmake | 2 -- cmake/patch/grpc-1.25.0-Makefile.patch | 24 ------------------------ 2 files changed, 26 deletions(-) delete mode 100644 cmake/patch/grpc-1.25.0-Makefile.patch diff --git a/cmake/modules/gRPC.cmake b/cmake/modules/gRPC.cmake index 13abdcaa..04d28543 100644 --- a/cmake/modules/gRPC.cmake +++ b/cmake/modules/gRPC.cmake @@ -107,10 +107,8 @@ else() BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} INSTALL_COMMAND "" CONFIGURE_COMMAND "" - PATCH_COMMAND patch -p1 < ${PROJECT_SOURCE_DIR}/cmake/patch/grpc-1.25.0-Makefile.patch BUILD_COMMAND CFLAGS=-Wno-implicit-fallthrough - LDFLAGS=-static HAS_SYSTEM_ZLIB=false HAS_SYSTEM_PROTOBUF=false HAS_SYSTEM_CARES=false diff --git a/cmake/patch/grpc-1.25.0-Makefile.patch b/cmake/patch/grpc-1.25.0-Makefile.patch deleted file mode 100644 index ba541dc6..00000000 --- a/cmake/patch/grpc-1.25.0-Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Makefile b/Makefile -index 8fd7044dd9..428da4c6c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -852,6 +852,7 @@ ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),) - LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/) - endif - endif -+LDFLAGS := $(LDFLAGS_PROTOBUF_PKG_CONFIG) $(LDFLAGS) - else - PC_LIBS_GRPCXX = -lprotobuf - endif -diff --git a/templates/Makefile.template b/templates/Makefile.template -index 8063bd4771..eac629d1c7 100644 ---- a/templates/Makefile.template -+++ b/templates/Makefile.template -@@ -749,6 +749,7 @@ - LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/) - endif - endif -+ LDFLAGS := $(LDFLAGS_PROTOBUF_PKG_CONFIG) $(LDFLAGS) - else - PC_LIBS_GRPCXX = -lprotobuf - endif