X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=7db450e0554c51b81d8c8cd79cfbeedfae867ce3;hb=88b2e3682be6303973fc59c3c62141d64a9e10d7;hp=f96235f4f0c27bac643c49afe036821687064c19;hpb=28e3db9dd617324a3196f369788d62cc72b5903b;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index f96235f4f0c..7db450e0554 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,44 +1,61 @@
-vpp_configure_depend =				\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-
-# 
-ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
-vpp_configure_args = --enable-dpdk-shared
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vpp_source = src
+
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
 else
-vpp_configure_args =
+CMAKE?=cmake
 endif
 
-# Platform dependent configure flags
-vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
-
-
-vpp_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra				\
-        openssl					\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-vpp_LDFLAGS = $(call installed_libs_fn,		\
-	vppinfra				\
-	openssl					\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-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)
-vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
+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_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-9/enable),)
+vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin"
+endif
+
+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) -- $(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 -- pkg-deb
+	@find $(PACKAGE_BUILD_DIR) \
+          -maxdepth 2 \
+          \( -name '*.changes' -o -name '*.deb' -o -name '*.buildinfo' \) \
+          -exec mv {} $(CURDIR) \;