44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From ad0cae3d6eb5a47e8ec0a52b78013e658aa1720b Mon Sep 17 00:00:00 2001
|
|
From: Mathieu Bridon <bochecha@daitauha.fr>
|
|
Date: Mon, 17 Dec 2018 11:41:34 +0100
|
|
Subject: [PATCH] Do not build the Ruby plugin
|
|
|
|
Unfortunately, this can't build without protobuf 3.6, so we must disable
|
|
it for Fedora 28 and 29 which only have protobuf 3.5.
|
|
---
|
|
Makefile | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 066c191..09ad70a 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -802,7 +802,7 @@ PC_LIBS_GRPCXX =
|
|
|
|
CPPFLAGS := -Ithird_party/googletest/googletest/include -Ithird_party/googletest/googlemock/include $(CPPFLAGS)
|
|
|
|
-PROTOC_PLUGINS_ALL = $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(BINDIR)/$(CONFIG)/grpc_node_plugin $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(BINDIR)/$(CONFIG)/grpc_php_plugin $(BINDIR)/$(CONFIG)/grpc_python_plugin $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
|
|
+PROTOC_PLUGINS_ALL = $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(BINDIR)/$(CONFIG)/grpc_node_plugin $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(BINDIR)/$(CONFIG)/grpc_php_plugin $(BINDIR)/$(CONFIG)/grpc_python_plugin
|
|
PROTOC_PLUGINS_DIR = $(BINDIR)/$(CONFIG)
|
|
|
|
ifeq ($(HAS_SYSTEM_PROTOBUF),true)
|
|
@@ -3151,7 +3151,6 @@ install-plugins: $(PROTOC_PLUGINS)
|
|
$(Q) $(INSTALL) -d $(prefix)/bin
|
|
$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_python_plugin $(prefix)/bin/grpc_python_plugin
|
|
$(Q) $(INSTALL) -d $(prefix)/bin
|
|
- $(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_ruby_plugin $(prefix)/bin/grpc_ruby_plugin
|
|
|
|
install-grpc-cli: grpc_cli
|
|
$(E) "[INSTALL] Installing grpc cli"
|
|
@@ -7162,7 +7161,6 @@ LIBGRPC_PLUGIN_SUPPORT_SRC = \
|
|
src/compiler/objective_c_generator.cc \
|
|
src/compiler/php_generator.cc \
|
|
src/compiler/python_generator.cc \
|
|
- src/compiler/ruby_generator.cc \
|
|
|
|
PUBLIC_HEADERS_CXX += \
|
|
include/grpc++/impl/codegen/config_protobuf.h \
|
|
--
|
|
2.17.2
|
|
|