You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ch...@apache.org on 2018/04/21 02:17:10 UTC
[3/7] mesos git commit: Cherry-picked gRPC PR #15128 for Windows
compilation.
Cherry-picked gRPC PR #15128 for Windows compilation.
We added a gRPC patch file that includes
https://github.com/grpc/grpc/pull/15128 to fix Windows compilation, and
updated `grpc.md` to match the format of `protobuf.md`.
Review: https://reviews.apache.org/r/66727/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e06f3ec0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e06f3ec0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e06f3ec0
Branch: refs/heads/master
Commit: e06f3ec093dc255a9236caebd42331471a7f1863
Parents: f905166
Author: Chun-Hung Hsiao <ch...@apache.org>
Authored: Fri Apr 20 18:17:46 2018 -0700
Committer: Chun-Hung Hsiao <ch...@mesosphere.io>
Committed: Fri Apr 20 18:17:46 2018 -0700
----------------------------------------------------------------------
3rdparty/grpc-1.10.0.patch | 22 ++++++++++++++++++++++
3rdparty/grpc-1.10.0.readme | 7 -------
3rdparty/grpc.md | 21 +++++++++++++++++++++
3 files changed, 43 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e06f3ec0/3rdparty/grpc-1.10.0.patch
----------------------------------------------------------------------
diff --git a/3rdparty/grpc-1.10.0.patch b/3rdparty/grpc-1.10.0.patch
new file mode 100644
index 0000000..98ae6af
--- /dev/null
+++ b/3rdparty/grpc-1.10.0.patch
@@ -0,0 +1,22 @@
+diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
+index bf1bf3df6a..85704e6559 100644
+--- a/include/grpc/impl/codegen/port_platform.h
++++ b/include/grpc/impl/codegen/port_platform.h
+@@ -39,6 +39,8 @@
+ #define NOMINMAX
+ #endif /* NOMINMAX */
+
++#include <windows.h>
++
+ #ifndef _WIN32_WINNT
+ #error \
+ "Please compile grpc with _WIN32_WINNT of at least 0x600 (aka Windows Vista)"
+@@ -49,8 +51,6 @@
+ #endif /* _WIN32_WINNT < 0x0600 */
+ #endif /* defined(_WIN32_WINNT) */
+
+-#include <windows.h>
+-
+ #ifdef GRPC_WIN32_LEAN_AND_MEAN_WAS_NOT_DEFINED
+ #undef GRPC_WIN32_LEAN_AND_MEAN_WAS_NOT_DEFINED
+ #undef WIN32_LEAN_AND_MEAN
http://git-wip-us.apache.org/repos/asf/mesos/blob/e06f3ec0/3rdparty/grpc-1.10.0.readme
----------------------------------------------------------------------
diff --git a/3rdparty/grpc-1.10.0.readme b/3rdparty/grpc-1.10.0.readme
deleted file mode 100644
index d33a808..0000000
--- a/3rdparty/grpc-1.10.0.readme
+++ /dev/null
@@ -1,7 +0,0 @@
-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/e06f3ec0/3rdparty/grpc.md
----------------------------------------------------------------------
diff --git a/3rdparty/grpc.md b/3rdparty/grpc.md
new file mode 100644
index 0000000..8d0e189
--- /dev/null
+++ b/3rdparty/grpc.md
@@ -0,0 +1,21 @@
+# gRPC
+
+## Project website
+
+https://github.com/grpc/grpc
+
+## How To Bundle
+
+```sh
+git clone -b v<version> https://github.com/grpc/grpc.git grpc-<version>
+(cd grpc-<version> && git submodule update --init third_party/cares)
+tar zcvf grpc-<version>.tar.gz --exclude .git grpc-<version>
+```
+
+## Bundled Version
+
+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)