X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=f8c93be6779a93e2ad07522ffd5bfcc79d9913ce;hb=e266ea3795747910127e189c5d341b93bb778091;hp=09df4a08dbc15e73145a6c9712be29020af6cc00;hpb=a3d933c87f146df801aa3947c25b6f1b2538f847;p=vpp.git diff --git a/Makefile b/Makefile index 09df4a08dbc..f8c93be6779 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 @@ -325,7 +324,7 @@ build: $(BR)/.bootstrap.ok wipedist: @$(RM) $(BR)/*.tar.xz -wipe: wipedist $(BR)/.bootstrap.ok +wipe: wipedist test-wipe $(BR)/.bootstrap.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) rebuild: wipe build @@ -333,7 +332,7 @@ rebuild: wipe build build-release: $(BR)/.bootstrap.ok $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS))) -wipe-release: $(BR)/.bootstrap.ok +wipe-release: test-wipe $(BR)/.bootstrap.ok $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS))) rebuild-release: wipe-release build-release