[mesos] branch master updated: Fixed gRPC compilation for non-SSL build.

[andschwa]

This is an automated email from the ASF dual-hosted git repository.

andschwa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 138bfbb  Fixed gRPC compilation for non-SSL build.
138bfbb is described below

commit 138bfbbba85653f48451d7708932e30bc97795aa
Author: Chun-Hung Hsiao <chhs...@apache.org>
AuthorDate: Fri Aug 10 16:33:59 2018 -0700

    Fixed gRPC compilation for non-SSL build.
    
    Review: https://reviews.apache.org/r/68303/
---
 3rdparty/grpc-1.10.0.patch | 15 ++++++++++++++-
 3rdparty/grpc.md           |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/3rdparty/grpc-1.10.0.patch b/3rdparty/grpc-1.10.0.patch
index 98ae6af..655f003 100644
--- a/3rdparty/grpc-1.10.0.patch
+++ b/3rdparty/grpc-1.10.0.patch
@@ -1,5 +1,18 @@
+diff --git a/Makefile b/Makefile
+index 8bab9c3afd..9f8261f0a4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15461,8 +15461,6 @@ $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/stats.o:  
$(LIBDIR)/$(CONFIG)/libgrpc
+ 
+ $(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_minimal.o:  
$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a 
$(LIBDIR)/$(CONFIG)/libgpr.a
+ 
+-$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o:  
$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a 
$(LIBDIR)/$(CONFIG)/libgpr.a
+-
+ deps_codegen_test_minimal: $(CODEGEN_TEST_MINIMAL_OBJS:.o=.dep)
+ 
+ ifneq ($(NO_SECURE),true)
 diff --git a/include/grpc/impl/codegen/port_platform.h 
b/include/grpc/impl/codegen/port_platform.h
-index bf1bf3df6a..85704e6559 100644
+index 819d17ce2a..77b587dac3 100644
 --- a/include/grpc/impl/codegen/port_platform.h
 +++ b/include/grpc/impl/codegen/port_platform.h
 @@ -39,6 +39,8 @@
diff --git a/3rdparty/grpc.md b/3rdparty/grpc.md
index 8d0e189..e06843c 100644
--- a/3rdparty/grpc.md
+++ b/3rdparty/grpc.md
@@ -19,3 +19,4 @@ We bundle 1.10.0 for better CMake build support.
 ## Cherry Picks
 
 - [Fixed undefined `_WIN32_WINNT` for generated files on 
Windows.](https://github.com/grpc/grpc/pull/15128)
+- [Removed unnecessary dependencies of `codegen_init.o` for unsecure 
build.](https://github.com/grpc/grpc/pull/16323)