X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=cf77a411266b204c327be522b86e2a92b567373a;hb=981fadf928dadac683d2f629edf738aa91510af3;hp=1a03470fac60df7127e8abd48348fa4f88d31138;hpb=f91fe3b060d58713d24e302abaf950556c26601e;p=vpp.git diff --git a/Makefile b/Makefile index 1a03470fac6..cf77a411266 100644 --- a/Makefile +++ b/Makefile @@ -82,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 @@ -110,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 @@ -345,6 +344,7 @@ define test LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ + OS_ID=$(OS_ID) \ $(3) endef