From b95995bd2c33f37ce9ea257379339d35f2a63c82 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Thu, 7 Jan 2016 18:10:21 +0000 Subject: Use openjdk7 as dependency for debian package of jdk7 flavor Fixes #752. -- MOS_MIGRATED_REVID=111614541 --- scripts/packages/BUILD | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'scripts/packages/BUILD') diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index fcc6a7dc5d..15b39c4de5 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -151,14 +151,26 @@ genrule( stamp = 1, ) +config_setting( + name = "jdk7", + values = {"define": "JAVA_VERSION=1.7"}, +) + pkg_deb( name = "bazel-debian", architecture = "amd64", built_using = "bazel (HEAD)", data = ":debian-data", - depends = [ - "openjdk-8-jdk", - "openjdk-8-source", + depends = select({ + ":jdk7": [ + "openjdk-7-jdk", + "openjdk-7-source", + ], + "//conditions:default": [ + "openjdk-8-jdk", + "openjdk-8-source", + ], + }) + [ "pkg-config", "zip", "g++", -- cgit v1.2.3