Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: patch protobuf to deal with too long CLI issues. #9824

Merged
merged 1 commit into from
Jan 24, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 57 additions & 1 deletion bazel/protobuf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,60 @@ index efc3d8e7f..746ad4851 100644
+ZLIB_DEPS = ["//external:zlib"]

################################################################################
# Protobuf Runtime Library
# 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,