diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-08-24 13:37:45 +0200 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2018-09-02 11:24:12 +0200 |
| commit | 855e26868ff8b9e6d00ca4d69ce6c9fdc0f2e121 (patch) | |
| tree | 84668d629d4bee4244d446dec7c94154211c65b5 /Makefile | |
| parent | edc4387602eb935c6e1702a713f0a5665c12d467 (diff) | |
Switch to cmake
Change-Id: I982b69390c55b5ffbd744f355efc0aaf425b360c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -21,10 +21,6 @@ STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) SUDO?=sudo -ifeq ($(findstring $(MAKECMDGOALS),verify pkg-deb pkg-rpm test test-debug),) -export vpp_uses_cmake?=yes -endif - ,:=, define disable_plugins $(if $(1), \ @@ -92,6 +88,7 @@ RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel +RPM_DEPENDS += cmake3 ninja-build ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) RPM_DEPENDS += subunit subunit-devel @@ -111,6 +108,7 @@ else RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python-ply RPM_DEPENDS += python-virtualenv + RPM_DEPENDS += devtoolset-7 RPM_DEPENDS_GROUPS = 'Development Tools' endif @@ -289,6 +287,7 @@ endif @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","") @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) + @sudo -E yum install $(CONFIRM) centos-release-scl-rh @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) @@ -548,6 +547,7 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) + $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif |