drop python3 dependency

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index c46fa6b..aaa6aee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,34 +58,42 @@ 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 += default-jdk-headless
+       DEB_DEPENDS += libssl-dev
 endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += apr-devel
-RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+       RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel
        RPM_DEPENDS += python2-virtualenv
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+       RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python2-devel
        RPM_DEPENDS += python2-virtualenv
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
+       RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel
        RPM_DEPENDS += python-virtualenv
        RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -101,14 +109,8 @@ else ifeq ($(findstring y,$(AESNI)),y)
 endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
-RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
-
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
-       RPM_DEPENDS += python34
-else
-       RPM_DEPENDS += python3
-endif
+RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf