From 051e124533bc73d6af27a5fbfbabd62793321eca Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 6 Aug 2020 12:02:02 -0500 Subject: Bazel: relax Java dependency (#17734) * Bazel: relax Java dependency * Flake8 fix --- var/spack/repos/builtin/packages/bazel/package.py | 12 +----------- 1 file changed, 1 insertion(+), 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')) -- cgit v1.2.3-70-g09d2