summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/bazel/package.py13
-rw-r--r--var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch25
2 files changed, 34 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py
index d70680fb84..6fd4ad731c 100644
--- a/var/spack/repos/builtin/packages/bazel/package.py
+++ b/var/spack/repos/builtin/packages/bazel/package.py
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
#
# This file is part of Spack.
@@ -32,8 +32,12 @@ class Bazel(Package):
"""Bazel is Google's own build tool"""
homepage = "https://www.bazel.io"
- url = "https://github.com/bazelbuild/bazel/releases/download/0.5.0/bazel-0.5.0-dist.zip"
+ url = "https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-dist.zip"
+ version('0.11.1', '80daac6b100b7f8e2b17d133150eba44')
+ version('0.11.0', 'e6caf93a805b45c33367028e575b91dd')
+ version('0.10.1', 'a7e5b9576993b752e31bd2d3259a14c5')
+ version('0.10.0', 'c2f15b34255099d25e94fce7283e5cd2')
version('0.9.0', '7fda74c163108f7c180bbc513bc8123b')
version('0.4.5', '2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b')
version('0.4.4', '5e7c52b89071efc41277e2f0057d258f')
@@ -43,14 +47,15 @@ class Bazel(Package):
version('0.2.2b', '75081804f073cbd194da1a07b16cba5f')
version('0.2.2', '644bc4ea7f429d835e74f255dc1054e6')
- depends_on('java@8:')
+ depends_on('java@8:', type=('build', 'link', 'run'))
depends_on('zip')
patch('fix_env_handling.patch', when='@:0.4.5')
patch('fix_env_handling-0.9.0.patch', when='@0.9.0:')
patch('link.patch')
patch('cc_configure.patch', when='@:0.4.5')
- patch('unix_cc_configure.patch', when='@0.9.0:')
+ patch('unix_cc_configure.patch', when='@0.9.0')
+ patch('unix_cc_configure-0.10.0.patch', when='@0.10.0:')
def url_for_version(self, version):
if version >= Version('0.4.1'):
diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch
new file mode 100644
index 0000000000..e375283fed
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch
@@ -0,0 +1,25 @@
+diff --git a/tools/cpp/unix_cc_configure.bzl.orig b/tools/cpp/unix_cc_configure.bzl
+index f67b9b5..cc952e0 100755
+--- a/tools/cpp/unix_cc_configure.bzl.orig
++++ b/tools/cpp/unix_cc_configure.bzl
+@@ -147,9 +147,18 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc, additional_flags = []):
+ else:
+ inc_dirs = result.stderr[index1 + 1:index2].strip()
+
+- return [_prepare_include_path(repository_ctx, _cxx_inc_convert(p))
+- for p in inc_dirs.split("\n")]
++ default_inc_directories = [
++ _prepare_include_path(repository_ctx, _cxx_inc_convert(p))
++ for p in inc_dirs.split("\n")
++ ]
+
++ env = repository_ctx.os.environ
++ if "SPACK_DEPENDENCIES" in env:
++ for dep in env["SPACK_DEPENDENCIES"].split(":"):
++ path = dep + "/include"
++ default_inc_directories.append(path)
++
++ return default_inc_directories
+
+ def _is_option_supported(repository_ctx, cc, option):
+ """Checks that `option` is supported by the C compiler. Doesn't %-escape the option."""