This is an automated email from the ASF dual-hosted git repository.
cfnatali 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 a2ae67e9b Fixed mesos-tidy build with new gRPC version. (#451)
a2ae67e9b is described below
commit a2ae67e9bca6f32f72dd82646bb61f7e9b3addd1
Author: cf-natali <cf.nat...@gmail.com>
AuthorDate: Sun Nov 27 18:17:31 2022 +0000
Fixed mesos-tidy build with new gRPC version. (#451)
And updated gRPC 3rdparty documentation to reflect updated version.
---
3rdparty/grpc.md | 10 +---------
support/mesos-tidy/entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/3rdparty/grpc.md b/3rdparty/grpc.md
index 4430e1f04..6acb6702a 100644
--- a/3rdparty/grpc.md
+++ b/3rdparty/grpc.md
@@ -14,7 +14,7 @@ tar zcvf grpc-<version>.tar.gz --exclude .git grpc-<version>
## Bundled Version
-We bundle 1.10.0 for better CMake build support.
+We bundle 1.11.1 for better CMake build support, and s390x support.
## Cherry Picks
@@ -29,11 +29,3 @@ We bundle 1.10.0 for better CMake build support.
- [CMake: Automatic fallbacking on system's OpenSSL if it only has
NPN.](https://github.com/chhsia0/grpc/commit/5c13ad2a3df1108184c716379818eab6fc0ba72d)
Upstream PR: https://github.com/grpc/grpc/pull/17726
-
-- [Fix gettid() naming
conflict.](https://github.com/grpc/grpc/commit/de6255941a5e1c2fb2d50e57f84e38c09f45023d)
-
- Upstream PR: https://github.com/grpc/grpc/pull/20048
-
-- [Rename gettid()
functions.](https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853)
-
- Upstream PR: https://github.com/grpc/grpc/pull/18950
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index 8bdd1ec18..03d6b6a32 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -43,7 +43,7 @@ cmake --build 3rdparty --target boost-1.65.0
cmake --build 3rdparty --target elfio-3.2
cmake --build 3rdparty --target glog-0.4.0
cmake --build 3rdparty --target googletest-1.8.0
-cmake --build 3rdparty --target grpc-1.10.0
+cmake --build 3rdparty --target grpc-1.11.1
cmake --build 3rdparty --target http_parser-2.6.2
# TODO(mpark): The `|| true` is a hack to try both `libev` and `libevent` and
