X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=fcce193c3f6658305e452b3e396fa029023e0265;hb=6cfe643106e903b5b301a2ca748de8b58721c8c8;hp=4bdaab34d12f76ffefa4fb4b7dc515de0d4e8dcf;hpb=6184db357d6af92173e78333e83b0ac4c8e5b51f;p=vpp.git diff --git a/Makefile b/Makefile index 4bdaab34d12..fcce193c3f6 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ 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 indent clang-format libnuma-dev DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check -DEB_DEPENDS += libboost-all-dev +DEB_DEPENDS += libboost-all-dev libffi-dev ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev @@ -84,15 +84,14 @@ RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += boost boost-devel +RPM_DEPENDS += subunit subunit-devel ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) - RPM_DEPENDS += subunit subunit-devel 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 += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel RPM_DEPENDS += python2-devel RPM_DEPENDS += python2-virtualenv @@ -355,6 +354,7 @@ define test EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ + CACHE_OUTPUT=$(CACHE_OUTPUT) \ $(3) endef