diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2019-11-20 14:23:26 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2019-11-20 14:23:26 +0000 |
| commit | d6ec6b34abd531e05b9ad0db0b9d93bbcd718e82 (patch) | |
| tree | 026d506613b9a73db9331dad3b5f87d3e157ace0 | |
| parent | security/softether-devel: Update to v4.31.9727-beta (diff) | |
Unbreak by reverting the patch for grpc 1.24, which was downgraded to 1.22 [1]
PR: 241933, 241594 [1]
Submitted by: James Wright <james.wright@digital-chaos.com>
| -rw-r--r-- | sysutils/apache-mesos/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/apache-mesos/files/patch-3rdparty_libprocess_include_process_grpc.hpp | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile index 26f2dee9e4c3..d1897e0fa869 100644 --- a/sysutils/apache-mesos/Makefile +++ b/sysutils/apache-mesos/Makefile @@ -2,7 +2,7 @@ PORTNAME= mesos PORTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= APACHE/mesos/${PORTVERSION} PKGNAMEPREFIX= apache- @@ -13,7 +13,6 @@ COMMENT= Cluster manager providing resource isolation and sharing LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build IGNORE_FreeBSD_11= does not build BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ diff --git a/sysutils/apache-mesos/files/patch-3rdparty_libprocess_include_process_grpc.hpp b/sysutils/apache-mesos/files/patch-3rdparty_libprocess_include_process_grpc.hpp deleted file mode 100644 index 5755bac3175f..000000000000 --- a/sysutils/apache-mesos/files/patch-3rdparty_libprocess_include_process_grpc.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 3rdparty/libprocess/include/process/grpc.hpp.orig 2019-11-04 22:31:46 UTC -+++ 3rdparty/libprocess/include/process/grpc.hpp -@@ -90,7 +90,7 @@ struct MethodTraits; // Undefined. - - template <typename Stub, typename Request, typename Response> - struct MethodTraits< -- std::unique_ptr<::grpc::ClientAsyncResponseReader<Response>>(Stub::*)( -+ std::unique_ptr<::grpc_impl::ClientAsyncResponseReader<Response>>(Stub::*)( - ::grpc::ClientContext*, - const Request&, - ::grpc::CompletionQueue*)> -@@ -235,7 +235,7 @@ class Runtime (public) - std::shared_ptr<Response> response(new Response()); - std::shared_ptr<::grpc::Status> status(new ::grpc::Status()); - -- std::shared_ptr<::grpc::ClientAsyncResponseReader<Response>> reader = -+ std::shared_ptr<::grpc_impl::ClientAsyncResponseReader<Response>> reader = - (typename internal::MethodTraits<Method>::stub_type( - connection.channel).*method)(context.get(), request, queue); - |