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 2019/01/16 00:35:14 UTC
[mesos] branch master updated (9cb154d -> 72e8d22)
This is an automated email from the ASF dual-hosted git repository.
chhsiao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 9cb154d Broke up `SSLTest.ProtocolMismatch` into smaller tests.
new e850b93 Added missing `libssl-dev` to the generated Ubuntu 16.04 image.
new 6452ffe Fixed gRPC CMake build issue on Ubuntu 14.04.
new 72e8d22 Added MESOS-9519 to the 1.7.1 CHANGELOG.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
3rdparty/CMakeLists.txt | 4 +--
3rdparty/grpc-1.10.0.patch | 79 ++++++++++++++++++++++++++++++++++++++--------
3rdparty/grpc.md | 13 ++++++--
CHANGELOG | 1 +
support/docker-build.sh | 2 +-
5 files changed, 81 insertions(+), 18 deletions(-)
[mesos] 03/03: Added MESOS-9519 to the 1.7.1 CHANGELOG.
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chhsiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 72e8d22668b3d600c7eea58d5b2a87e2c3fa325a
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Tue Jan 15 15:15:08 2019 -0800
Added MESOS-9519 to the 1.7.1 CHANGELOG.
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 3150220..5c05185 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ Release Notes - Mesos - Version 1.7.1
* [MESOS-9505] - `make check` failed with linking errors when c-ares is installed.
* [MESOS-9508] - Official 1.7.0 tarball can't be built on Ubuntu 16.04 LTS.
* [MESOS-9518] - CNI_NETNS should not be set for orphan containers that do not have network namespace.
+ * [MESOS-9519] - Unable to build Mesos with CMake on Ubuntu 14.04.
** Improvement:
* [MESOS-6765] - Make the Resources wrapper "copy-on-write" to improve performance.
[mesos] 02/03: Fixed gRPC CMake build issue on Ubuntu 14.04.
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chhsiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 6452ffe84ea0a2c266a273cd640f14084dbd0e73
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Thu Jan 10 15:31:07 2019 -0800
Fixed gRPC CMake build issue on Ubuntu 14.04.
This patch cherry-picks an unofficial commit to disable ALPN compilation
if only OpenSSL 1.0.1 is on the system.
Review: https://reviews.apache.org/r/69708
---
3rdparty/CMakeLists.txt | 4 +--
3rdparty/grpc-1.10.0.patch | 79 ++++++++++++++++++++++++++++++++++++++--------
3rdparty/grpc.md | 13 ++++++--
3 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 703808d..b74772e 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -1296,9 +1296,9 @@ set_target_properties(
grpc PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${GRPC_ROOT}/include)
-if (WIN32)
- PATCH_CMD(GRPC_PATCH_CMD grpc-${GRPC_VERSION}.patch)
+PATCH_CMD(GRPC_PATCH_CMD grpc-${GRPC_VERSION}.patch)
+if (WIN32)
list(APPEND GRPC_CMAKE_ARGS -DZLIB_ROOT=${ZLIB_ROOT}-lib)
if (CMAKE_GENERATOR MATCHES "Visual Studio")
diff --git a/3rdparty/grpc-1.10.0.patch b/3rdparty/grpc-1.10.0.patch
index 655f003..00dddbc 100644
--- a/3rdparty/grpc-1.10.0.patch
+++ b/3rdparty/grpc-1.10.0.patch
@@ -1,16 +1,9 @@
-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)
+From 90869cffbd0cd05ee663e1b81cda169dd40cdf22 Mon Sep 17 00:00:00 2001
+From: Chun-Hung Hsiao <ch...@mesosphere.io>
+Date: Thu, 19 Apr 2018 14:15:10 -0700
+Subject: [PATCH] Fixed undefined `_WIN32_WINNT` for Windows compilation.
+
+
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index 819d17ce2a..77b587dac3 100644
--- a/include/grpc/impl/codegen/port_platform.h
@@ -33,3 +26,63 @@ index 819d17ce2a..77b587dac3 100644
#ifdef GRPC_WIN32_LEAN_AND_MEAN_WAS_NOT_DEFINED
#undef GRPC_WIN32_LEAN_AND_MEAN_WAS_NOT_DEFINED
#undef WIN32_LEAN_AND_MEAN
+--
+2.17.2 (Apple Git-113)
+
+
+From 6531532de6a35ed8e00e24d3b60e88fd90d01335 Mon Sep 17 00:00:00 2001
+From: Chun-Hung Hsiao <ch...@mesosphere.io>
+Date: Fri, 10 Aug 2018 14:00:03 -0700
+Subject: [PATCH] Removed unnecessary dependencies of `codegen_init.o` for
+ unsecure build.
+
+`codegen_init.cc` is listed in `LIBGRPC++_UNSECURE_SRC`, which are
+compiled without SSL, but in `Makefile` lists SSL-required libraries as
+its dependencies. Since the file itself does not use any bits from those
+libraries, it is safe to remove those dependencies.
+
+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)
+--
+2.17.2 (Apple Git-113)
+
+
+From 5c13ad2a3df1108184c716379818eab6fc0ba72d Mon Sep 17 00:00:00 2001
+From: Chun-Hung Hsiao <ch...@mesosphere.io>
+Date: Thu, 10 Jan 2019 14:26:11 -0800
+Subject: [PATCH] CMake: Automatic fallbacking on system's OpenSSL if it only
+ has NPN.
+
+Since ALPN is not supported on some old systems that come with OpenSSL
+version 1.0.1 or older, gRPC needs to fall back to NPN when being built
+with these systems' OpenSSL.
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 83f642a675..8e2253fb39 100644
+--- a/cmake/ssl.cmake
++++ b/cmake/ssl.cmake
+@@ -36,6 +36,10 @@ elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package")
+ # project itself does not provide installation support in its CMakeLists.txt
+ # See https://cmake.org/cmake/help/v3.6/module/FindOpenSSL.html
+ find_package(OpenSSL REQUIRED)
++
++ if (OPENSSL_VERSION VERSION_LESS "1.0.2")
++ add_definitions(-DTSI_OPENSSL_ALPN_SUPPORT=0)
++ endif()
+
+ if(TARGET OpenSSL::SSL)
+ set(_gRPC_SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+--
+2.17.2 (Apple Git-113)
+
diff --git a/3rdparty/grpc.md b/3rdparty/grpc.md
index e06843c..fab174f 100644
--- a/3rdparty/grpc.md
+++ b/3rdparty/grpc.md
@@ -18,5 +18,14 @@ 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)
+- [Fixed undefined `_WIN32_WINNT` for generated files on Windows.](https://github.com/chhsia0/grpc/commit/90869cffbd0cd05ee663e1b81cda169dd40cdf22)
+
+ Upstream PR: https://github.com/grpc/grpc/pull/15128
+
+- [Removed unnecessary dependencies of `codegen_init.o` for unsecure build.](https://github.com/chhsia0/grpc/commit/6531532de6a35ed8e00e24d3b60e88fd90d01335)
+
+ Upstream PR: https://github.com/grpc/grpc/pull/16323
+
+- [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
[mesos] 01/03: Added missing `libssl-dev` to the generated Ubuntu
16.04 image.
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chhsiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit e850b93ecda6e3699e37717503ff474c7117ec72
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Fri Jan 11 13:53:04 2019 -0800
Added missing `libssl-dev` to the generated Ubuntu 16.04 image.
Review: https://reviews.apache.org/r/69725
---
support/docker-build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/docker-build.sh b/support/docker-build.sh
index 910196f..0c6988d 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -73,7 +73,7 @@ case $OS in
[ "$(uname -m)" = "x86_64" ] && CLANG_PKG=clang-3.5 || CLANG_PKG=
append_dockerfile "RUN apt-get update"
append_dockerfile "RUN apt-get install -y build-essential $CLANG_PKG git maven autoconf libtool software-properties-common"
- append_dockerfile "RUN apt-get install -y python-dev python-six libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev"
+ append_dockerfile "RUN apt-get install -y python-dev python-six libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev libssl-dev"
append_dockerfile "RUN apt-get install -y wget curl sed"
case $OS in