X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=6571cd2cf0924c5ddaa99de0763eedf00675fe53;hb=2baa115da3b752cd7e44cc477f2c45bda22d444b;hp=4002cbcf57f3d028a2a9a123d236c4d9781d216e;hpb=ad1e1c5b2d5134e88456a2078f38fa207599171f;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 4002cbcf57f..6571cd2cf09 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -12,69 +12,50 @@
 # limitations under the License.
 
 vpp_source = src
-ifneq ($(vpp_uses_cmake),yes)
 
-ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
-vpp_configure_args = --enable-dpdk-shared
-else
-vpp_configure_args =
-endif
-
-# Platform dependent configure flags
-vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
-
-
-vpp_CPPFLAGS =
-vpp_LDFLAGS =
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vpp_configure_depend += dpdk-install
-vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk
-vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
-vpp_CPPFLAGS += -I/usr/include/dpdk
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
-vpp_configure_args += --with-dpdk-mlx5-pmd
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx4_pmd),yes)
-vpp_configure_args += --with-dpdk-mlx4-pmd
-endif
-else
-vpp_configure_args += --disable-dpdk-plugin
-endif
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vpp_configure_args += --enable-tests
-endif
-
-else
 ifneq ($(shell which cmake3),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake
 endif
 
+vpp_cmake_prefix_path  = /opt/vpp/external/$(shell uname -m)
+vpp_cmake_prefix_path += $(PACKAGE_INSTALL_DIR)external
+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 += -DDPDK_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/include"
-vpp_cmake_args += -DDPDK_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/lib"
+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
+endif
+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"
 endif
 
-vpp_configure_depend += dpdk-install
+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'
-endif
+
+vpp-package-deb: vpp-install
+	@$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- package-deb
+	@find $(PACKAGE_BUILD_DIR) \
+          -maxdepth 1 \
+          \( -name '*.changes' -o -name '*.deb' -o -name '*.buildinfo' \) \
+          -exec mv {} $(CURDIR) \;