Merge pull request #81633 from andir/bazel_0_fix_tensorflow
Tensorflow: fix #77626
This commit is contained in:
commit
82b54d4906
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
|
{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
|
||||||
, addOpenGLRunpath
|
, addOpenGLRunpath
|
||||||
# Python deps
|
# Python deps
|
||||||
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
|
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
|
||||||
|
@ -94,7 +94,7 @@ let
|
||||||
|
|
||||||
bazel-build = buildBazelPackage {
|
bazel-build = buildBazelPackage {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
bazel = bazel_1;
|
bazel = bazel_0;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tensorflow";
|
owner = "tensorflow";
|
||||||
|
@ -121,7 +121,6 @@ let
|
||||||
sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
|
sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
|
||||||
})
|
})
|
||||||
|
|
||||||
./tf-1.15-bazel-1.0.patch
|
|
||||||
|
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
# be compatible with gast >0.2 instead of only gast 0.2.2
|
# be compatible with gast >0.2 instead of only gast 0.2.2
|
||||||
|
@ -283,7 +282,6 @@ let
|
||||||
bazelFlags = [
|
bazelFlags = [
|
||||||
# temporary fixes to make the build work with bazel 0.27
|
# temporary fixes to make the build work with bazel 0.27
|
||||||
"--incompatible_no_support_tools_in_action_inputs=false"
|
"--incompatible_no_support_tools_in_action_inputs=false"
|
||||||
"--incompatible_use_native_patch=false"
|
|
||||||
];
|
];
|
||||||
bazelBuildFlags = [
|
bazelBuildFlags = [
|
||||||
"--config=opt" # optimize using the flags set in the configure phase
|
"--config=opt" # optimize using the flags set in the configure phase
|
||||||
|
@ -299,9 +297,9 @@ let
|
||||||
# FIXME: can't (re)produce this output with current bazel.
|
# FIXME: can't (re)produce this output with current bazel.
|
||||||
# FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
|
# FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
|
||||||
sha256 = if cudaSupport then
|
sha256 = if cudaSupport then
|
||||||
"0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im"
|
"0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw"
|
||||||
else
|
else
|
||||||
"04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz";
|
"1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildAttrs = {
|
buildAttrs = {
|
||||||
|
@ -422,6 +420,9 @@ in buildPythonPackage {
|
||||||
x = np.random.uniform(size=(1,1))
|
x = np.random.uniform(size=(1,1))
|
||||||
y = np.random.uniform(size=(1,))
|
y = np.random.uniform(size=(1,))
|
||||||
model.fit(x, y, epochs=1)
|
model.fit(x, y, epochs=1)
|
||||||
|
|
||||||
|
# regression test for #77626
|
||||||
|
from tensorflow.contrib import tensor_forest
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1,213 +0,0 @@
|
||||||
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
|
|
||||||
index f740ba66b5..6cc9003787 100644
|
|
||||||
--- a/tensorflow/c/BUILD
|
|
||||||
+++ b/tensorflow/c/BUILD
|
|
||||||
@@ -270,6 +270,7 @@ tf_cuda_library(
|
|
||||||
"//tensorflow/core/platform",
|
|
||||||
"@com_google_absl//absl/strings",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
exports_files(
|
|
||||||
diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD
|
|
||||||
index 5c42e508f7..16b421862c 100644
|
|
||||||
--- a/tensorflow/c/eager/BUILD
|
|
||||||
+++ b/tensorflow/c/eager/BUILD
|
|
||||||
@@ -79,6 +79,7 @@ tf_cuda_library(
|
|
||||||
"//tensorflow/core/profiler/lib:profiler_session",
|
|
||||||
"//tensorflow/core:gpu_runtime",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
tf_cuda_library(
|
|
||||||
@@ -226,6 +227,7 @@ tf_cuda_library(
|
|
||||||
"//tensorflow/core/profiler/rpc/client:capture_profile",
|
|
||||||
"//tensorflow/core:gpu_runtime",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
tf_cuda_cc_test(
|
|
||||||
diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD
|
|
||||||
index 39b84922d1..b2affdd999 100644
|
|
||||||
--- a/tensorflow/cc/saved_model/BUILD
|
|
||||||
+++ b/tensorflow/cc/saved_model/BUILD
|
|
||||||
@@ -123,6 +123,7 @@ cc_library(
|
|
||||||
"//tensorflow/core/util/tensor_bundle:naming",
|
|
||||||
# mobile not supported yet
|
|
||||||
]),
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
tf_cc_test(
|
|
||||||
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
|
|
||||||
index c23c1f9b39..805643b217 100644
|
|
||||||
--- a/tensorflow/core/BUILD
|
|
||||||
+++ b/tensorflow/core/BUILD
|
|
||||||
@@ -777,6 +777,7 @@ cc_library(
|
|
||||||
":lib_proto_parsing",
|
|
||||||
":protos_all_cc",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
# DEPRECATED: use platform:stringpiece instead.
|
|
||||||
@@ -2496,6 +2497,7 @@ cc_library(
|
|
||||||
"@com_google_protobuf//:protobuf",
|
|
||||||
] + tf_protos_all_impl() + tf_protos_grappler_impl() +
|
|
||||||
tf_additional_numa_deps(),
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
# File compiled with extra flags to get cpu-specific acceleration.
|
|
||||||
diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD
|
|
||||||
index 3bd933261b..e1e589e76d 100644
|
|
||||||
--- a/tensorflow/core/lib/random/BUILD
|
|
||||||
+++ b/tensorflow/core/lib/random/BUILD
|
|
||||||
@@ -50,6 +50,7 @@ cc_library(
|
|
||||||
"//tensorflow/core/platform:types",
|
|
||||||
"//third_party/eigen3",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
|
|
||||||
index 5459d8d428..feba3a5686 100644
|
|
||||||
--- a/tensorflow/core/platform/default/build_config.bzl
|
|
||||||
+++ b/tensorflow/core/platform/default/build_config.bzl
|
|
||||||
@@ -228,6 +228,7 @@ def cc_proto_library(
|
|
||||||
hdrs = gen_hdrs,
|
|
||||||
deps = cc_libs + deps,
|
|
||||||
includes = includes,
|
|
||||||
+ alwayslink = 1,
|
|
||||||
**kargs
|
|
||||||
)
|
|
||||||
native.cc_library(
|
|
||||||
diff --git a/tensorflow/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD
|
|
||||||
index 6dcdab2aee..32bb0a8d85 100644
|
|
||||||
--- a/tensorflow/lite/java/src/test/native/BUILD
|
|
||||||
+++ b/tensorflow/lite/java/src/test/native/BUILD
|
|
||||||
@@ -19,6 +19,7 @@ cc_library(
|
|
||||||
"//tensorflow/lite/java/jni",
|
|
||||||
"//tensorflow/lite/kernels:kernel_util",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
tflite_jni_binary(
|
|
||||||
diff --git a/tensorflow/lite/python/testdata/BUILD b/tensorflow/lite/python/testdata/BUILD
|
|
||||||
index 7bda81358f..ac1188d844 100644
|
|
||||||
--- a/tensorflow/lite/python/testdata/BUILD
|
|
||||||
+++ b/tensorflow/lite/python/testdata/BUILD
|
|
||||||
@@ -60,6 +60,7 @@ cc_library(
|
|
||||||
deps = [
|
|
||||||
"//tensorflow/lite/c:c_api_internal",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
cc_binary(
|
|
||||||
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
|
|
||||||
index 6fd9b4f273..29df3a3dff 100644
|
|
||||||
--- a/tensorflow/python/BUILD
|
|
||||||
+++ b/tensorflow/python/BUILD
|
|
||||||
@@ -375,6 +375,7 @@ cc_library(
|
|
||||||
"//tensorflow/core:lib",
|
|
||||||
"//tensorflow/core:protos_all_cc",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
cc_library(
|
|
||||||
@@ -411,6 +412,7 @@ cc_library(
|
|
||||||
"//third_party/py/numpy:headers",
|
|
||||||
"//third_party/python_runtime:headers",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
cc_library(
|
|
||||||
@@ -617,6 +619,7 @@ cc_library(
|
|
||||||
"//tensorflow/core:op_gen_lib",
|
|
||||||
"//tensorflow/core:protos_all_cc",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
py_library(
|
|
||||||
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
|
|
||||||
index a3956322fe..32752f59ad 100644
|
|
||||||
--- a/tensorflow/tensorflow.bzl
|
|
||||||
+++ b/tensorflow/tensorflow.bzl
|
|
||||||
@@ -2331,6 +2331,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = []
|
|
||||||
hdrs = out_hdrs,
|
|
||||||
visibility = visibility,
|
|
||||||
deps = deps,
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
def tf_genrule_cmd_append_to_srcs(to_append):
|
|
||||||
diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD
|
|
||||||
index adafe2aca1..8965316b12 100644
|
|
||||||
--- a/tensorflow/tools/graph_transforms/BUILD
|
|
||||||
+++ b/tensorflow/tools/graph_transforms/BUILD
|
|
||||||
@@ -223,6 +223,7 @@ cc_library(
|
|
||||||
"//tensorflow/core:lib_internal",
|
|
||||||
"//tensorflow/core:protos_all_cc",
|
|
||||||
],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
|
|
||||||
# This library includes a main function, to make it easy to create other
|
|
||||||
diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel
|
|
||||||
index 7db21566e4..8e18c7cc3a 100644
|
|
||||||
--- a/third_party/icu/data/BUILD.bazel
|
|
||||||
+++ b/third_party/icu/data/BUILD.bazel
|
|
||||||
@@ -43,4 +43,5 @@ cc_library(
|
|
||||||
name = "conversion_data",
|
|
||||||
srcs = [":conversion_data.c"],
|
|
||||||
deps = ["@icu//:headers"],
|
|
||||||
+ alwayslink = 1,
|
|
||||||
)
|
|
||||||
diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch
|
|
||||||
index df0648563d..18fc6cdf35 100644
|
|
||||||
--- a/third_party/protobuf/protobuf.patch
|
|
||||||
+++ b/third_party/protobuf/protobuf.patch
|
|
||||||
@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Protobuf Runtime Library
|
|
||||||
-@@ -218,7 +218,7 @@ cc_library(
|
|
||||||
+@@ -209,6 +209,7 @@ cc_library(
|
|
||||||
+ copts = COPTS,
|
|
||||||
+ includes = ["src/"],
|
|
||||||
+ linkopts = LINK_OPTS,
|
|
||||||
++ alwayslink = 1,
|
|
||||||
+ visibility = ["//visibility:public"],
|
|
||||||
+ deps = [":protobuf_lite"] + PROTOBUF_DEPS,
|
|
||||||
+ )
|
|
||||||
+@@ -219,7 +220,7 @@ cc_library(
|
|
||||||
# TODO(keveman): Remove this target once the support gets added to Bazel.
|
|
||||||
cc_library(
|
|
||||||
name = "protobuf_headers",
|
|
||||||
@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644
|
|
||||||
includes = ["src/"],
|
|
||||||
visibility = ["//visibility:public"],
|
|
||||||
)
|
|
||||||
+
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl
|
|
||||||
index 774514f3fd..1c415b018b 100644
|
|
||||||
--- a/third_party/systemlibs/protobuf.bzl
|
|
||||||
+++ b/third_party/systemlibs/protobuf.bzl
|
|
||||||
@@ -262,6 +262,7 @@ def cc_proto_library(
|
|
||||||
hdrs = gen_hdrs,
|
|
||||||
deps = cc_libs + deps,
|
|
||||||
includes = includes,
|
|
||||||
+ alwayslink = 1,
|
|
||||||
**kargs
|
|
||||||
)
|
|
||||||
|
|
375
pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
Normal file
375
pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
Normal file
|
@ -0,0 +1,375 @@
|
||||||
|
{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
|
||||||
|
, zip, unzip, bash, writeCBin, coreutils
|
||||||
|
, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||||
|
# Apple dependencies
|
||||||
|
, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
|
||||||
|
# Allow to independently override the jdks used to build and run respectively
|
||||||
|
, buildJdk, runJdk
|
||||||
|
, buildJdkName
|
||||||
|
, runtimeShell
|
||||||
|
# Always assume all markers valid (don't redownload dependencies).
|
||||||
|
# Also, don't clean up environment variables.
|
||||||
|
, enableNixHacks ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
srcDeps = [
|
||||||
|
# From: $REPO_ROOT/WORKSPACE
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
|
||||||
|
sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz";
|
||||||
|
sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz";
|
||||||
|
sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz";
|
||||||
|
sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_linux-v3.1.zip";
|
||||||
|
sha256 = "a0cd51f9db1bf05a722ff7f5c60a07fa1c7d27428fff0815c342d32aa6c53576";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_darwin-v3.1.zip";
|
||||||
|
sha256 = "c646aad8808b8ec5844d6a80a1287fc8e13203375fe40d6af4819eff48b9bbaf";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip";
|
||||||
|
sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip";
|
||||||
|
sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz";
|
||||||
|
sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
distDir = runCommand "bazel-deps" {} ''
|
||||||
|
mkdir -p $out
|
||||||
|
for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
|
||||||
|
'';
|
||||||
|
|
||||||
|
defaultShellPath = lib.makeBinPath
|
||||||
|
# Keep this list conservative. For more exotic tools, prefer to use
|
||||||
|
# @rules_nixpkgs to pull in tools from the nix repository. Example:
|
||||||
|
#
|
||||||
|
# WORKSPACE:
|
||||||
|
#
|
||||||
|
# nixpkgs_git_repository(
|
||||||
|
# name = "nixpkgs",
|
||||||
|
# revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
|
||||||
|
# )
|
||||||
|
#
|
||||||
|
# # This defines an external Bazel workspace.
|
||||||
|
# nixpkgs_package(
|
||||||
|
# name = "bison",
|
||||||
|
# repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
|
||||||
|
# )
|
||||||
|
#
|
||||||
|
# some/BUILD.bazel:
|
||||||
|
#
|
||||||
|
# genrule(
|
||||||
|
# ...
|
||||||
|
# cmd = "$(location @bison//:bin/bison) -other -args",
|
||||||
|
# tools = [
|
||||||
|
# ...
|
||||||
|
# "@bison//:bin/bison",
|
||||||
|
# ],
|
||||||
|
# )
|
||||||
|
#
|
||||||
|
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
|
||||||
|
|
||||||
|
# Java toolchain used for the build and tests
|
||||||
|
javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
|
||||||
|
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
|
version = "0.26.0";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/bazelbuild/bazel/";
|
||||||
|
description = "Build tool that builds code quickly and reliably";
|
||||||
|
license = licenses.asl20;
|
||||||
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Additional tests that check bazel’s functionality. Execute
|
||||||
|
#
|
||||||
|
# nix-build . -A bazel.tests
|
||||||
|
#
|
||||||
|
# in the nixpkgs checkout root to exercise them locally.
|
||||||
|
passthru.tests = {
|
||||||
|
pythonBinPath = callPackage ./python-bin-path-test.nix {};
|
||||||
|
bashTools = callPackage ./bash-tools-test.nix {};
|
||||||
|
};
|
||||||
|
|
||||||
|
name = "bazel-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
|
||||||
|
sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Necessary for the tests to pass on Darwin with sandbox enabled.
|
||||||
|
# Bazel starts a local server and needs to bind a local address.
|
||||||
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./glibc.patch
|
||||||
|
./python-stub-path-fix.patch
|
||||||
|
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
|
||||||
|
|
||||||
|
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
||||||
|
|
||||||
|
customBash = writeCBin "bash" ''
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
extern char **environ;
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
char *path = getenv("PATH");
|
||||||
|
char *pathToAppend = "${defaultShellPath}";
|
||||||
|
char *newPath;
|
||||||
|
if (path != NULL) {
|
||||||
|
int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
|
||||||
|
newPath = malloc(length * sizeof(char));
|
||||||
|
snprintf(newPath, length, "%s:%s", path, pathToAppend);
|
||||||
|
} else {
|
||||||
|
newPath = pathToAppend;
|
||||||
|
}
|
||||||
|
setenv("PATH", newPath, 1);
|
||||||
|
execve("${bash}/bin/bash", argv, environ);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
postPatch = let
|
||||||
|
|
||||||
|
darwinPatches = ''
|
||||||
|
# Disable Bazel's Xcode toolchain detection which would configure compilers
|
||||||
|
# and linkers from Xcode instead of from PATH
|
||||||
|
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
|
||||||
|
|
||||||
|
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
|
||||||
|
export GCOV=${coreutils}/bin/false
|
||||||
|
|
||||||
|
# Framework search paths aren't added by bintools hook
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/41914
|
||||||
|
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
|
||||||
|
|
||||||
|
# libcxx includes aren't added by libcxx hook
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/41589
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
|
||||||
|
|
||||||
|
# don't use system installed Xcode to run clang, use Nix clang instead
|
||||||
|
sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
|
||||||
|
scripts/bootstrap/compile.sh \
|
||||||
|
src/tools/xcode/realpath/BUILD \
|
||||||
|
src/tools/xcode/stdredirect/BUILD \
|
||||||
|
tools/osx/BUILD
|
||||||
|
|
||||||
|
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
|
||||||
|
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
|
||||||
|
|
||||||
|
# clang installed from Xcode has a compatibility wrapper that forwards
|
||||||
|
# invocations of gcc to clang, but vanilla clang doesn't
|
||||||
|
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
|
||||||
|
|
||||||
|
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
|
||||||
|
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
|
||||||
|
for wrapper in "''${wrappers[@]}"; do
|
||||||
|
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
genericPatches = ''
|
||||||
|
# Substitute python's stub shebang to plain python path. (see TODO add pr URL)
|
||||||
|
# See also `postFixup` where python is added to $out/nix-support
|
||||||
|
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
|
||||||
|
--replace "/usr/bin/env python" "${python}/bin/python" \
|
||||||
|
--replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
|
||||||
|
|
||||||
|
# md5sum is part of coreutils
|
||||||
|
sed -i 's|/sbin/md5|md5sum|' \
|
||||||
|
src/BUILD
|
||||||
|
|
||||||
|
# substituteInPlace is rather slow, so prefilter the files with grep
|
||||||
|
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
|
||||||
|
# If you add more replacements here, you must change the grep above!
|
||||||
|
# Only files containing /bin are taken into account.
|
||||||
|
substituteInPlace "$path" \
|
||||||
|
--replace /bin/bash ${customBash}/bin/bash \
|
||||||
|
--replace /usr/bin/env ${coreutils}/bin/env \
|
||||||
|
--replace /bin/true ${coreutils}/bin/true
|
||||||
|
done
|
||||||
|
|
||||||
|
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
||||||
|
substituteInPlace scripts/bootstrap/compile.sh \
|
||||||
|
--replace /bin/bash ${customBash}/bin/bash
|
||||||
|
|
||||||
|
# add nix environment vars to .bazelrc
|
||||||
|
cat >> .bazelrc <<EOF
|
||||||
|
build --experimental_distdir=${distDir}
|
||||||
|
fetch --experimental_distdir=${distDir}
|
||||||
|
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
|
||||||
|
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
|
||||||
|
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
|
||||||
|
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
|
||||||
|
build --host_javabase='@local_jdk//:jdk'
|
||||||
|
build --host_java_toolchain='${javaToolchain}'
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# add the same environment vars to compile.sh
|
||||||
|
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
|
||||||
|
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
|
||||||
|
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
|
||||||
|
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
|
||||||
|
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
|
||||||
|
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
|
||||||
|
-i scripts/bootstrap/compile.sh
|
||||||
|
|
||||||
|
# --experimental_strict_action_env (which will soon become the
|
||||||
|
# default, see bazelbuild/bazel#2574) hardcodes the default
|
||||||
|
# action environment to a value that on NixOS at least is bogus.
|
||||||
|
# So we hardcode it to something useful.
|
||||||
|
substituteInPlace \
|
||||||
|
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
|
||||||
|
--replace /bin:/usr/bin ${defaultShellPath}
|
||||||
|
|
||||||
|
# This is necessary to avoid:
|
||||||
|
# "error: no visible @interface for 'NSDictionary' declares the selector
|
||||||
|
# 'initWithContentsOfURL:error:'"
|
||||||
|
# This can be removed when the apple_sdk is upgraded beyond 10.13+
|
||||||
|
sed -i '/initWithContentsOfURL:versionPlistUrl/ {
|
||||||
|
N
|
||||||
|
s/error:nil\];/\];/
|
||||||
|
}' tools/osx/xcode_locator.m
|
||||||
|
|
||||||
|
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
|
||||||
|
echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
|
||||||
|
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
|
||||||
|
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
|
||||||
|
|
||||||
|
patchShebangs .
|
||||||
|
'';
|
||||||
|
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
|
||||||
|
+ genericPatches;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
buildJdk
|
||||||
|
];
|
||||||
|
|
||||||
|
# when a command can’t be found in a bazel build, you might also
|
||||||
|
# need to add it to `defaultShellPath`.
|
||||||
|
nativeBuildInputs = [
|
||||||
|
zip
|
||||||
|
python
|
||||||
|
unzip
|
||||||
|
makeWrapper
|
||||||
|
which
|
||||||
|
customBash
|
||||||
|
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
|
||||||
|
|
||||||
|
# Bazel makes extensive use of symlinks in the WORKSPACE.
|
||||||
|
# This causes problems with infinite symlinks if the build output is in the same location as the
|
||||||
|
# Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
|
||||||
|
# subdirectory.
|
||||||
|
# Failing to do this causes "infinite symlink expansion detected"
|
||||||
|
preBuildPhases = ["preBuildPhase"];
|
||||||
|
preBuildPhase = ''
|
||||||
|
mkdir bazel_src
|
||||||
|
shopt -s dotglob extglob
|
||||||
|
mv !(bazel_src) bazel_src
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
# Increasing memory during compilation might be necessary.
|
||||||
|
# export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
|
||||||
|
./bazel_src/compile.sh
|
||||||
|
./bazel_src/scripts/generate_bash_completion.sh \
|
||||||
|
--bazel=./bazel_src/output/bazel \
|
||||||
|
--output=./bazel_src/output/bazel-complete.bash \
|
||||||
|
--prepend=./bazel_src/scripts/bazel-complete-header.bash \
|
||||||
|
--prepend=./bazel_src/scripts/bazel-complete-template.bash
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
|
||||||
|
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
|
||||||
|
# if it can’t find something in tools, it calls $out/bin/bazel-real
|
||||||
|
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
|
||||||
|
mv ./bazel_src/output/bazel $out/bin/bazel-real
|
||||||
|
|
||||||
|
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
|
||||||
|
|
||||||
|
# shell completion files
|
||||||
|
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
|
||||||
|
mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
|
||||||
|
cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Temporarily disabling for now. A new approach is needed for this derivation as Bazel
|
||||||
|
# accesses the internet during the tests which fails in a sandbox.
|
||||||
|
doInstallCheck = false;
|
||||||
|
installCheckPhase = ''
|
||||||
|
export TEST_TMPDIR=$(pwd)
|
||||||
|
|
||||||
|
hello_test () {
|
||||||
|
$out/bin/bazel test \
|
||||||
|
--test_output=errors \
|
||||||
|
--java_toolchain='${javaToolchain}' \
|
||||||
|
examples/cpp:hello-success_test \
|
||||||
|
examples/java-native/src/test/java/com/example/myproject:hello
|
||||||
|
}
|
||||||
|
|
||||||
|
cd ./bazel_src
|
||||||
|
|
||||||
|
# test whether $WORKSPACE_ROOT/tools/bazel works
|
||||||
|
|
||||||
|
mkdir -p tools
|
||||||
|
cat > tools/bazel <<"EOF"
|
||||||
|
#!${runtimeShell} -e
|
||||||
|
exit 1
|
||||||
|
EOF
|
||||||
|
chmod +x tools/bazel
|
||||||
|
|
||||||
|
# first call should fail if tools/bazel is used
|
||||||
|
! hello_test
|
||||||
|
|
||||||
|
cat > tools/bazel <<"EOF"
|
||||||
|
#!${runtimeShell} -e
|
||||||
|
exec "$BAZEL_REAL" "$@"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# second call succeeds because it defers to $out/bin/bazel-real
|
||||||
|
hello_test
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Save paths to hardcoded dependencies so Nix can detect them.
|
||||||
|
postFixup = ''
|
||||||
|
mkdir -p $out/nix-support
|
||||||
|
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
|
||||||
|
# The templates get tar’d up into a .jar,
|
||||||
|
# so nix can’t detect python is needed in the runtime closure
|
||||||
|
echo "${python}" >> $out/nix-support/depends
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontStrip = true;
|
||||||
|
dontPatchELF = true;
|
||||||
|
}
|
|
@ -0,0 +1,78 @@
|
||||||
|
From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853
|
||||||
|
From: Benjamin Peterson <benjamin@dropbox.com>
|
||||||
|
Date: Fri, 3 May 2019 08:11:00 -0700
|
||||||
|
Subject: [PATCH] Rename gettid() functions.
|
||||||
|
|
||||||
|
glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
|
||||||
|
---
|
||||||
|
src/core/lib/gpr/log_linux.cc | 6 ++----
|
||||||
|
src/core/lib/gpr/log_posix.cc | 4 ++--
|
||||||
|
src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
|
||||||
|
3 files changed, 6 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
|
||||||
|
index 81026e5689b..8b597b4cf2f 100644
|
||||||
|
--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc
|
||||||
|
+++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
#include <time.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-static long gettid(void) { return syscall(__NR_gettid); }
|
||||||
|
+static long sys_gettid(void) { return syscall(__NR_gettid); }
|
||||||
|
|
||||||
|
void gpr_log(const char* file, int line, gpr_log_severity severity,
|
||||||
|
const char* format, ...) {
|
||||||
|
@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
|
||||||
|
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
|
||||||
|
struct tm tm;
|
||||||
|
static __thread long tid = 0;
|
||||||
|
- if (tid == 0) tid = gettid();
|
||||||
|
+ if (tid == 0) tid = sys_gettid();
|
||||||
|
|
||||||
|
timer = static_cast<time_t>(now.tv_sec);
|
||||||
|
final_slash = strrchr(args->file, '/');
|
||||||
|
diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
|
||||||
|
index b6edc14ab6b..2f7c6ce3760 100644
|
||||||
|
--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc
|
||||||
|
+++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc
|
||||||
|
@@ -31,7 +31,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
|
||||||
|
+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
|
||||||
|
|
||||||
|
void gpr_log(const char* file, int line, gpr_log_severity severity,
|
||||||
|
const char* format, ...) {
|
||||||
|
@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
|
||||||
|
char* prefix;
|
||||||
|
gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
|
||||||
|
gpr_log_severity_string(args->severity), time_buffer,
|
||||||
|
- (int)(now.tv_nsec), gettid(), display_file, args->line);
|
||||||
|
+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
|
||||||
|
|
||||||
|
fprintf(stderr, "%-70s %s\n", prefix, args->message);
|
||||||
|
gpr_free(prefix);
|
||||||
|
diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
|
||||||
|
index c2d80c08ddb..4a83cb6c215 100644
|
||||||
|
--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
|
||||||
|
+++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
|
||||||
|
@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef NDEBUG
|
||||||
|
-static long gettid(void) { return syscall(__NR_gettid); }
|
||||||
|
+static long sys_gettid(void) { return syscall(__NR_gettid); }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* pollset->mu lock must be held by the caller before calling this.
|
||||||
|
@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
|
||||||
|
#define WORKER_PTR (&worker)
|
||||||
|
#endif
|
||||||
|
#ifndef NDEBUG
|
||||||
|
- WORKER_PTR->originator = gettid();
|
||||||
|
+ WORKER_PTR->originator = sys_gettid();
|
||||||
|
#endif
|
||||||
|
if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
|
||||||
|
gpr_log(GPR_INFO,
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||||
|
index dac21c9a83..69b11c283f 100644
|
||||||
|
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||||
|
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||||
|
@@ -67,7 +67,7 @@ def FindPythonBinary(module_space):
|
||||||
|
return os.path.join(module_space, PYTHON_BINARY)
|
||||||
|
else:
|
||||||
|
# Case 4: Path has to be looked up in the search path.
|
||||||
|
- return SearchPath(PYTHON_BINARY)
|
||||||
|
+ return "NIX_STORE_PYTHON_PATH"
|
||||||
|
|
||||||
|
def CreatePythonPathEntries(python_imports, module_space):
|
||||||
|
parts = python_imports.split(':');
|
|
@ -9781,6 +9781,15 @@ in
|
||||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bazel_0 = callPackage ../development/tools/build-managers/bazel/bazel_0 {
|
||||||
|
inherit (darwin) cctools;
|
||||||
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
|
||||||
|
buildJdk = jdk8;
|
||||||
|
buildJdkName = "jdk8";
|
||||||
|
runJdk = jdk11_headless;
|
||||||
|
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 {
|
bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 {
|
||||||
inherit (darwin) cctools;
|
inherit (darwin) cctools;
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
|
||||||
|
|
Loading…
Reference in a new issue