From 4aba6d375439f368798877ec307a3af5f789b24f Mon Sep 17 00:00:00 2001
From: Harvey Tuch <htuch@google.com>
Date: Fri, 24 Jan 2020 14:03:54 -0500
Subject: [PATCH] build: patch protobuf to deal with too long CLI issues.

Since #9383 merged, I've been unable to bazel build @envoy_api//...

Upsteam fix at https://github.com/protocolbuffers/protobuf/pull/7135

Adding as a patch to avoid having to bump protobuf version when that
merges just for this.

Risk level: Low
Testing: bazel build @envoy_api//...

Signed-off-by: Harvey Tuch <htuch@google.com>
---
 bazel/protobuf.patch | 58 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/bazel/protobuf.patch b/bazel/protobuf.patch
index cb7637afe11b..4058c201beb4 100644
--- a/bazel/protobuf.patch
+++ b/bazel/protobuf.patch
@@ -91,4 +91,60 @@ index efc3d8e7f..746ad4851 100644
 +ZLIB_DEPS = ["//external:zlib"]
 
  ################################################################################
- # Protobuf Runtime Library
\ No newline at end of file
+ # Protobuf Runtime Library
+
+diff --git a/protobuf.bzl b/protobuf.bzl
+index 5fa5543b1..484bc41a7 100644
+--- a/protobuf.bzl
++++ b/protobuf.bzl
+@@ -75,18 +75,17 @@ def _RelativeOutputPath(path, include, dest = ""):
+ def _proto_gen_impl(ctx):
+     """General implementation for generating protos"""
+     srcs = ctx.files.srcs
+-    deps = []
+-    deps += ctx.files.srcs
++    deps = depset(direct=ctx.files.srcs)
+     source_dir = _SourceDir(ctx)
+     gen_dir = _GenDir(ctx).rstrip("/")
+     if source_dir:
+-        import_flags = ["-I" + source_dir, "-I" + gen_dir]
++        import_flags = depset(direct=["-I" + source_dir, "-I" + gen_dir])
+     else:
+-        import_flags = ["-I."]
++        import_flags = depset(direct=["-I."])
+ 
+     for dep in ctx.attr.deps:
+-        import_flags += dep.proto.import_flags
+-        deps += dep.proto.deps
++        import_flags = depset(transitive=[import_flags, dep.proto.import_flags])
++        deps = depset(transitive=[deps, dep.proto.deps])
+ 
+     if not ctx.attr.gen_cc and not ctx.attr.gen_py and not ctx.executable.plugin:
+         return struct(
+@@ -103,7 +102,7 @@ def _proto_gen_impl(ctx):
+         in_gen_dir = src.root.path == gen_dir
+         if in_gen_dir:
+             import_flags_real = []
+-            for f in depset(import_flags).to_list():
++            for f in import_flags.to_list():
+                 path = f.replace("-I", "")
+                 import_flags_real.append("-I$(realpath -s %s)" % path)
+ 
+@@ -118,7 +117,7 @@ def _proto_gen_impl(ctx):
+             outs.extend(_PyOuts([src.basename], use_grpc_plugin = use_grpc_plugin))
+ 
+         outs = [ctx.actions.declare_file(out, sibling = src) for out in outs]
+-        inputs = [src] + deps
++        inputs = [src] + deps.to_list()
+         tools = [ctx.executable.protoc]
+         if ctx.executable.plugin:
+             plugin = ctx.executable.plugin
+@@ -141,7 +140,7 @@ def _proto_gen_impl(ctx):
+                 inputs = inputs,
+                 tools = tools,
+                 outputs = outs,
+-                arguments = args + import_flags + [src.path],
++                arguments = args + import_flags.to_list() + [src.path],
+                 executable = ctx.executable.protoc,
+                 mnemonic = "ProtoCompile",
+                 use_default_shell_env = True,