Bumped bundled gRPC to 1.10.0. Review: https://reviews.apache.org/r/66094
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b5892180 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b5892180 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b5892180 Branch: refs/heads/master Commit: b5892180263455d578b72f89704065362371f869 Parents: 7660eb5 Author: Chun-Hung Hsiao <chhs...@mesosphere.io> Authored: Thu Mar 15 10:59:01 2018 -0700 Committer: Chun-Hung Hsiao <chhs...@mesosphere.io> Committed: Wed Mar 21 12:23:09 2018 -0700 ---------------------------------------------------------------------- 3rdparty/Makefile.am | 4 -- 3rdparty/grpc-1.10.0.readme | 7 +++ 3rdparty/grpc-1.10.0.tar.gz | Bin 0 -> 14791756 bytes 3rdparty/grpc-1.8.3.patch | 71 ------------------------ 3rdparty/grpc-1.8.3.readme | 12 ---- 3rdparty/grpc-1.8.3.tar.gz | Bin 6264212 -> 0 bytes 3rdparty/versions.am | 2 +- src/python/native_common/ext_modules.py.in | 2 +- 8 files changed, 9 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am index f4cb731..4347114 100644 --- a/3rdparty/Makefile.am +++ b/3rdparty/Makefile.am @@ -94,10 +94,6 @@ EXTRA_DIST = \ EXTRA_DIST += \ $(GLOG).patch -# We patch grpc for compilation issues. See `grpc-1.8.3.readme`. -EXTRA_DIST += \ - $(GRPC).patch - # We need to patch leveldb to prevent it from linking to snappy and # tcmalloc; see MESOS-1054, MESOS-1624. EXTRA_DIST += \ http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/grpc-1.10.0.readme ---------------------------------------------------------------------- diff --git a/3rdparty/grpc-1.10.0.readme b/3rdparty/grpc-1.10.0.readme new file mode 100644 index 0000000..d33a808 --- /dev/null +++ b/3rdparty/grpc-1.10.0.readme @@ -0,0 +1,7 @@ +The bundled `grpc-1.10.0.tar.gz` package is generated with the following command: + +```sh +git clone -b v1.10.0 https://github.com/grpc/grpc.git grpc-1.10.0 +(cd grpc-1.10.0 && git submodule update --init third_party/cares) +tar zcvf grpc-1.10.0.tar.gz --exclude .git grpc-1.10.0 +``` http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/grpc-1.10.0.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/grpc-1.10.0.tar.gz b/3rdparty/grpc-1.10.0.tar.gz new file mode 100644 index 0000000..e6ae8d4 Binary files /dev/null and b/3rdparty/grpc-1.10.0.tar.gz differ http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/grpc-1.8.3.patch ---------------------------------------------------------------------- diff --git a/3rdparty/grpc-1.8.3.patch b/3rdparty/grpc-1.8.3.patch deleted file mode 100644 index 495e484..0000000 --- a/3rdparty/grpc-1.8.3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/Makefile b/Makefile -index 3d8f77ab6a..e6bd9f9c04 100644 ---- a/Makefile -+++ b/Makefile -@@ -2703,7 +2703,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so - endif - $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)" -@@ -2712,7 +2712,7 @@ endif - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_cronet.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so - endif - $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)" -@@ -2721,7 +2721,7 @@ endif - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_error_details.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so - endif - $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)" -@@ -2730,7 +2730,7 @@ endif - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_reflection.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so - endif - $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)" -@@ -2739,7 +2739,7 @@ endif - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_unsecure.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so - endif - ifneq ($(SYSTEM),MINGW32) -@@ -2756,7 +2756,7 @@ install-shared_csharp: shared_csharp strip-shared_csharp - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a $(prefix)/lib/libgrpc_csharp_ext.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.5 -+ $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so - endif - ifneq ($(SYSTEM),MINGW32) -diff --git a/templates/Makefile.template b/templates/Makefile.template -index 3eb838857a..38bdf7a409 100644 ---- a/templates/Makefile.template -+++ b/templates/Makefile.template -@@ -1347,7 +1347,7 @@ - ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]})-dll.a $(prefix)/lib/lib${lib.name}.a - else ifneq ($(SYSTEM),Darwin) -- $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/lib${lib.name}.so.${settings.core_version.major} -+ $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/lib${lib.name}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} - $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/lib${lib.name}.so - endif - % endif http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/grpc-1.8.3.readme ---------------------------------------------------------------------- diff --git a/3rdparty/grpc-1.8.3.readme b/3rdparty/grpc-1.8.3.readme deleted file mode 100644 index d2f6b36..0000000 --- a/3rdparty/grpc-1.8.3.readme +++ /dev/null @@ -1,12 +0,0 @@ -The bundled `grpc-1.8.3.tar.gz` package is generated with the following command: - -```sh -git clone -b v1.8.3 https://github.com/grpc/grpc.git grpc-1.8.3 -(cd grpc-1.8.3 && git submodule update --init third_party/cares) -tar zcvf grpc-1.8.3.tar.gz --exclude .git grpc-1.8.3 -``` - -The following lists the commits cherry-picked in `grpc-1.8.3.patch`: - -- Changes templates/Makefile.template to install grpc with correct .so version numbers - https://github.com/grpc/grpc/pull/11558 http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/grpc-1.8.3.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/grpc-1.8.3.tar.gz b/3rdparty/grpc-1.8.3.tar.gz deleted file mode 100644 index ba1e4cf..0000000 Binary files a/3rdparty/grpc-1.8.3.tar.gz and /dev/null differ http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/3rdparty/versions.am ---------------------------------------------------------------------- diff --git a/3rdparty/versions.am b/3rdparty/versions.am index 3e008d5..1bc87bb 100644 --- a/3rdparty/versions.am +++ b/3rdparty/versions.am @@ -26,7 +26,7 @@ ELFIO_VERSION = 3.2 GLOG_VERSION = 0.3.3 GOOGLETEST_VERSION = 1.8.0 GPERFTOOLS_VERSION = 2.5 -GRPC_VERSION = 1.8.3 +GRPC_VERSION = 1.10.0 HTTP_PARSER_VERSION = 2.6.2 LEVELDB_VERSION = 1.19 LIBEV_VERSION = 4.22 http://git-wip-us.apache.org/repos/asf/mesos/blob/b5892180/src/python/native_common/ext_modules.py.in ---------------------------------------------------------------------- diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in index 0fb39c0..87387fd 100644 --- a/src/python/native_common/ext_modules.py.in +++ b/src/python/native_common/ext_modules.py.in @@ -128,7 +128,7 @@ def _create_module(module_name): # We need to check for the presense of libgrpc++.a, libgrpc.a and libgpr.a # only if gRPC is enabled. if '@ENABLE_GRPC_FALSE@' == '#': - grpc = os.path.join('3rdparty', 'grpc-1.8.3') + grpc = os.path.join('3rdparty', 'grpc-1.10.0') libgrpcxx = os.path.join(abs_top_builddir, grpc, 'libs', 'opt', 'libgrpc++.a') libgrpc = os.path.join(abs_top_builddir, grpc, 'libs', 'opt', 'libgrpc.a') libgpr = os.path.join(abs_top_builddir, grpc, 'libs', 'opt', 'libgpr.a')
