|
|
|
|
Index: Makefile
|
|
|
|
|
--- Makefile.orig 2018-12-13 00:49:38.000000000 +0100
|
|
|
|
|
+++ Makefile 2018-12-14 01:00:27.569455000 +0100
|
|
|
|
|
@@ -353,9 +353,9 @@
|
|
|
|
|
CXXFLAGS += -stdlib=libc++
|
|
|
|
|
endif
|
|
|
|
|
CXXFLAGS += -Wnon-virtual-dtor
|
|
|
|
|
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
|
|
|
|
|
+CPPFLAGS += -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
|
|
|
|
|
COREFLAGS += -fno-rtti -fno-exceptions
|
|
|
|
|
-LDFLAGS += -g
|
|
|
|
|
+LDFLAGS +=
|
|
|
|
|
|
|
|
|
|
CPPFLAGS += $(CPPFLAGS_$(CONFIG))
|
|
|
|
|
CFLAGS += $(CFLAGS_$(CONFIG))
|
|
|
|
|
@@ -873,7 +873,7 @@
|
|
|
|
|
.SECONDARY = %.pb.h %.pb.cc
|
|
|
|
|
|
|
|
|
|
ifeq ($(DEP_MISSING),)
|
|
|
|
|
-all: static shared plugins
|
|
|
|
|
+all: static plugins
|
|
|
|
|
dep_error:
|
|
|
|
|
@echo "You shouldn't see this message - all of your dependencies are correct."
|
|
|
|
|
else
|
|
|
|
|
@@ -2943,9 +2943,9 @@
|
|
|
|
|
|
|
|
|
|
install: install_c install_cxx install-plugins install-certs
|
|
|
|
|
|
|
|
|
|
-install_c: install-headers_c install-static_c install-shared_c
|
|
|
|
|
+install_c: install-headers_c install-static_c
|
|
|
|
|
|
|
|
|
|
-install_cxx: install-headers_cxx install-static_cxx install-shared_cxx
|
|
|
|
|
+install_cxx: install-headers_cxx install-static_cxx
|
|
|
|
|
|
|
|
|
|
install_csharp: install-shared_csharp install_c
|
|
|
|
|
|
|
|
|
|
@@ -3050,11 +3050,6 @@
|
|
|
|
|
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.7
|
|
|
|
|
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so
|
|
|
|
|
endif
|
|
|
|
|
-ifneq ($(SYSTEM),MINGW32)
|
|
|
|
|
-ifneq ($(SYSTEM),Darwin)
|
|
|
|
|
- $(Q) ldconfig || true
|
|
|
|
|
-endif
|
|
|
|
|
-endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
|
|
|
|
|
Index: src/compiler/ruby_generator.cc
|
|
|
|
|
--- src/compiler/ruby_generator.cc.orig 2018-12-13 00:49:38.000000000 +0100
|
|
|
|
|
+++ src/compiler/ruby_generator.cc 2018-12-14 12:14:19.100089000 +0100
|
|
|
|
|
@@ -162,11 +162,7 @@
|
|
|
|
|
|
|
|
|
|
std::string package_name;
|
|
|
|
|
|
|
|
|
|
- if (file->options().has_ruby_package()) {
|
|
|
|
|
- package_name = file->options().ruby_package();
|
|
|
|
|
- } else {
|
|
|
|
|
package_name = file->package();
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
// Write out a file header.
|
|
|
|
|
std::map<grpc::string, grpc::string> header_comment_vars = ListToDict({
|
