X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=4dd65ecb4fcec51a3f078ef2c9ebf5898f8ebfdd;hb=5ca8bfcacb3be58c46965ab52fba72ac6dfb828c;hp=ec61083455ed8db379a9c6a95a48d85b612b4fb0;hpb=49c1bc845d0bc77542982f85cc64f57e2b5b70f6;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index ec61083455e..4dd65ecb4fc 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -25,34 +25,32 @@ vpp_cmake_prefix_path := $(subst $() $(),;,$(vpp_cmake_prefix_path))
 
 vpp_cmake_args ?=
 vpp_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR)
-vpp_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)"
-vpp_cmake_args += -DCMAKE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
+vpp_cmake_args += -DCMAKE_BUILD_TYPE="$($(TAG)_TAG_BUILD_TYPE)"
 vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)"
 ifeq ("$(V)","1")
 vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 endif
-ifeq (,$(TARGET_PLATFORM))
-ifeq ($(MACHINE),aarch64)
-vpp_cmake_args += -DVPP_LOG2_CACHE_LINE_SIZE=7
+ifneq ($(VPP_EXCLUDED_PLUGINS),)
+vpp_cmake_args += -DVPP_EXCLUDED_PLUGINS="$(VPP_EXCLUDED_PLUGINS)"
 endif
+ifneq (${SOURCE_DATE_EPOCH}),)
+vpp_cmake_args += -DVPP_SOURCE_DATE_EPOCH="$(SOURCE_DATE_EPOCH)"
 endif
 
-# Use devtoolset on centos 7
-ifneq ($(wildcard /opt/rh/devtoolset-7/enable),)
-vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"
+ifneq ($(VPP_EXTRA_CMAKE_ARGS),)
+vpp_cmake_args += $(VPP_EXTRA_CMAKE_ARGS)
 endif
 
 vpp_configure_depend += external-install
 vpp_configure = \
   cd $(PACKAGE_BUILD_DIR) && \
   $(CMAKE) -G Ninja $(vpp_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))
-#vpp_make_args = --no-print-directory
-vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR)
+vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS)
 vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'
 
 vpp-package-deb: vpp-install
-	@$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- package-deb
+	@$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- pkg-deb
 	@find $(PACKAGE_BUILD_DIR) \
-          -maxdepth 1 \
+          -maxdepth 2 \
           \( -name '*.changes' -o -name '*.deb' -o -name '*.buildinfo' \) \
           -exec mv {} $(CURDIR) \;