diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-05 18:03:27 -0500 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-05-07 13:03:22 +0000 |
| commit | 027103e561a1a04c348a2507129e943297748e2a (patch) | |
| tree | 279f800c34c747a31c5b21b58273587c27af1845 | |
| parent | 59611303fb70a739544c280177f315bf1508d761 (diff) | |
Switch to using -headless JDK
By default, jdks bring a bunch of UI related things
we don't need, so switch to headeless.
Also, use default-jdk-headless for Ubuntu after 14.04.
Use openjdk-8-jdk-headless for Ubuntu 14.04.
Change-Id: I3cf14c39c9f59dc2f1beba8dfb19971f4b67f5a6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -28,8 +28,13 @@ OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\" OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache -DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd +DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope +ifeq ($(OS_VERSION_ID),14.04) + DEB_DEPENDS += openjdk-8-jdk-headless +else + DEB_DEPENDS += default-jdk-headless +endif RPM_DEPENDS_GROUPS = 'Development Tools' RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils |