summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Ivanov <anton.ivanov@cambridgegreys.com>2017-09-21 13:15:53 +0100
committerChris Luke <chris_luke@comcast.com>2017-09-21 16:10:48 +0000
commite6f3b467947038a924a71d884ee924a9bc8de9f8 (patch)
treea558cb91c57dcd6ccc87df56d05b6da03ac2e8df
parent5349f94d992886afd6bf0137004758933b4a858e (diff)
Fix for ssl dependency on debian 9
Change-Id: I32f46c5a6f0e43e7f3e38b05d9607d43faf41501 Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index dbd2fc22f48..b8aca4706f6 100644
--- a/Makefile
+++ b/Makefile
@@ -58,18 +58,23 @@ endif
# +libganglia1-dev if building the gmond plugin
-DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
+DEB_DEPENDS = curl build-essential autoconf automake bison ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
+ DEB_DEPENDS += libssl-dev
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += openjdk-8-jdk-headless
+ DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports
-else
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
DEB_DEPENDS += default-jdk-headless
+ DEB_DEPENDS += libssl1.0-dev
+else
+ DEB_DEPENDS += libssl-dev
endif
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils