diff options
| author |  Misha Brukman <mbrukman@google.com> | 2016-11-25 15:18:35 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2016-11-28 08:40:35 +0000 |
| commit | 1dda3436da0ae98ff4c4bc949621106b5b33f878 (patch) | |
| tree | 1e9762fc31e0d2cd8ed949295ec74fb515440b1e /scripts/packages | |
| parent | 7e5fb40196c9186b00462b80300cce7595815eed (diff) | |
Add Oracle JDK 7/8 as optional dependencies.
With this change, `oracle-java7-installer` and `oracle-java8-installer` become
alternatives to satisfy the JDK dependency and thus can be implicitly installed
when someone just asks to install Bazel by itself.
Resolves issue #1821.
Closes #2137.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2137
MOS_MIGRATED_REVID=140200795
Diffstat (limited to 'scripts/packages')
| -rw-r--r-- | scripts/packages/BUILD | 4 | ||||
| -rw-r--r-- | scripts/packages/debian/control | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 27efd3e602..f324e3a3e9 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -155,10 +155,10 @@ pkg_deb( data = ":debian-data", depends = select({ "//tools/jdk:jdk7": [ - "java7-jdk | java7-sdk", + "java7-jdk | java7-sdk | oracle-java7-installer", ], "//conditions:default": [ - "google-jdk | java8-jdk | java8-sdk", + "google-jdk | java8-jdk | java8-sdk | oracle-java8-installer", ], }) + [ "g++", diff --git a/scripts/packages/debian/control b/scripts/packages/debian/control index acbec62934..3253c5d22d 100644 --- a/scripts/packages/debian/control +++ b/scripts/packages/debian/control @@ -9,7 +9,7 @@ Package: bazel Section: contrib/devel Priority: optional Architecture: amd64 -Depends: google-jdk | java8-jdk | java8-sdk, g++, zlib1g-dev, bash-completion +Depends: google-jdk | java8-jdk | java8-sdk | oracle-java8-installer, g++, zlib1g-dev, bash-completion Conflicts: openjdk-9-jdk Description: Bazel is a tool that automates software builds and tests. Supported build tasks include running compilers and linkers to produce |