ABF: remove the inclusion of version.h from abf_policy so it does not recompile each...

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 06e15f0..1eb1f0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,6 +113,7 @@ endif
 RPM_DEPENDS += chrpath libffi-devel rpm-build
 
 SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
+SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
 RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
 RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply
 
@@ -125,13 +126,17 @@ RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
 RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
 
 ifeq ($(OS_ID),opensuse)
-ifneq ($(SUSE_NAME),Tumbleweed)
-       RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
-       RPM_SUSE_PYTHON_DEPS += python-virtualenv
-else
+ifeq ($(SUSE_NAME),Tumbleweed)
        RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
        RPM_SUSE_PYTHON_DEPS += python2-virtualenv
 endif
+ifeq ($(SUSE_ID),15.0)
+       RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
+       RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+else
+       RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+       RPM_SUSE_PYTHON_DEPS += python-virtualenv
+endif
 endif
 
 RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
@@ -508,13 +513,6 @@ endef
 verify: install-dep $(BR)/.deps.ok dpdk-install-dev
        $(call banner,"Building for PLATFORM=vpp using gcc")
        @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
-       $(call banner,"Installing dependencies")
-       @sudo -E apt-get update
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install clang
-       $(call banner,"Building for PLATFORM=vpp using clang")
-       @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
-endif
        $(call banner,"Building sample-plugin")
        @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
        $(call banner,"Building libmemif")