Skip to content
Snippets Groups Projects
Commit fe882553 authored by Alexandre Strube's avatar Alexandre Strube Committed by Damian Alvarez
Browse files

Bazel 3.6.0 (removes 3.4.1) for TensorFlow

parent 9b51b62c
Branches
No related tags found
No related merge requests found
repos:
- repo: https://github.com/pre-commit/mirrors-autopep8
rev: '' # Use the sha / tag you want to point at
hooks:
- id: autopep8
\ No newline at end of file
From cd3c41eb5a29ca475b7bafc42aa71e94363d46df Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Tue, 28 Jul 2020 19:51:13 +0200
Subject: [PATCH] Fix environment for protobuf compilation in grpc
Add use_default_shell_env = True to protoc invocation for grpc to mirror
what the protobuf cc_proto_library & co are doing
Fixes a failure in invocing protoc when it is build in a non-default
environment (e.g. with a custom LD_LIBRARY_PATH)
Fixes #11852, fixes #11855
---
third_party/grpc/bazel/generate_cc.bzl | 1 +
1 file changed, 1 insertion(+)
diff --git a/third_party/grpc/bazel/generate_cc.bzl b/third_party/grpc/bazel/generate_cc.bzl
index 38a5b460f90..d5a4e27bc88 100644
--- a/third_party/grpc/bazel/generate_cc.bzl
+++ b/third_party/grpc/bazel/generate_cc.bzl
@@ -123,6 +123,7 @@ def generate_cc_impl(ctx):
outputs = out_files,
executable = ctx.executable.protoc,
arguments = arguments,
+ use_default_shell_env = True,
)
return struct(files = depset(out_files))
--- third_party/grpc/bazel/generate_cc.bzl.orig 2020-08-04 14:19:51.304155177 +0200
+++ third_party/grpc/bazel/generate_cc.bzl 2020-08-04 14:20:08.316748158 +0200
@@ -123,6 +123,7 @@
outputs = out_files,
executable = ctx.executable.protoc,
arguments = arguments,
+ use_default_shell_env = True,
)
return struct(files = depset(out_files))
name = 'Bazel' name = 'Bazel'
version = '3.4.1' version = '3.6.0'
homepage = 'http://bazel.io/' homepage = 'http://bazel.io/'
description = """Bazel is a build tool that builds code quickly and reliably. description = """Bazel is a build tool that builds code quickly and reliably.
...@@ -11,9 +11,16 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'} ...@@ -11,9 +11,16 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s'] source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s']
sources = ['%(namelower)s-%(version)s-dist.zip'] sources = ['%(namelower)s-%(version)s-dist.zip']
patches = ['%(name)s-%(version)s_fix_protobuf_libstdc.patch'] patches = ['%(name)s-3.4.1-fix-grpc-protoc.patch']
builddependencies = [
('binutils', '2.34'),
('Python', '3.8.5'),
('Zip', '3.0'),
]
prebuildopts = "export BAZEL_LINKOPTS=-static-libstdc++:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm && "
builddependencies = [('binutils', '2.34')]
dependencies = [('Java', '1.8', '', True)] dependencies = [('Java', '1.8', '', True)]
moduleclass = 'devel' moduleclass = 'devel'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment