diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-08-06 12:02:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-06 13:02:02 -0400 |
commit | 051e124533bc73d6af27a5fbfbabd62793321eca (patch) | |
tree | cf32edfe1f19c673c3cfe9988d9297a55e717ce5 /var | |
parent | f3ec1d445d929dac6a001d3a1231985a198d16ae (diff) | |
download | spack-051e124533bc73d6af27a5fbfbabd62793321eca.tar.gz spack-051e124533bc73d6af27a5fbfbabd62793321eca.tar.bz2 spack-051e124533bc73d6af27a5fbfbabd62793321eca.tar.xz spack-051e124533bc73d6af27a5fbfbabd62793321eca.zip |
Bazel: relax Java dependency (#17734)
* Bazel: relax Java dependency
* Flake8 fix
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/bazel/package.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 27f2da0597..b64bdc1ac1 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -3,9 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * -import platform - class Bazel(Package): """Bazel is an open-source build and test tool similar to Make, Maven, and @@ -96,14 +93,7 @@ class Bazel(Package): variant('nodepfail', default=True, description='Disable failing dependency checks due to injected absolute paths - required for most builds using bazel with spack') - # https://docs.bazel.build/versions/master/install-compile-source.html#bootstrap-bazel - # Until https://github.com/spack/spack/issues/14058 is fixed, use jdk to build bazel - # Strict dependency on java@8 as per - # https://docs.bazel.build/versions/master/install-compile-source.html#bootstrap-unix-prereq - if platform.machine() == 'aarch64': - depends_on('java@8:8.999', type=('build', 'run')) - else: - depends_on('jdk@1.8.0:1.8.999', type=('build', 'run')) + depends_on('java', type=('build', 'run')) depends_on('python', type=('build', 'run')) depends_on('zip', type=('build', 'run')) |