X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=cf77a411266b204c327be522b86e2a92b567373a;hb=981fadf928dadac683d2f629edf738aa91510af3;hp=cc26ea52ffe9304413bbfb2de060798edb5ea814;hpb=dc33d4ccb3712ab313f9d471cde35ef208aa0e29;p=vpp.git diff --git a/Makefile b/Makefile index cc26ea52ffe..cf77a411266 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ 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 @@ -81,6 +82,11 @@ RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check + +ifeq ($(filter centos,$(OS_ID)),$(OS_ID)) + RPM_DEPENDS += check-devel subunit subunit-devel +endif + ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel @@ -109,13 +115,7 @@ 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 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 += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf @@ -344,6 +344,7 @@ define test LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ + OS_ID=$(OS_ID) \ $(3) endef