MAP: Use bool type in map.api instead of u8.

[vpp.git] / build-data / packages / vpp.mk

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index be10e17..2a1b9a7 100644 (file)
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,48 +1,46 @@
-vpp_configure_depend =                         \
-       vppinfra-install                        \
-       svm-install                             \
-       vlib-api-install                        \
-       vlib-install                            \
-       vnet-install                            \
+# 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.
 
-# 
-ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
-vpp_configure_args = --enable-dpdk-shared
+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                                \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet)
-
-vpp_LDFLAGS = $(call installed_libs_fn,                \
-       vppinfra                                \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet)
+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))
 
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vpp_CPPFLAGS += $(call installed_includes_fn, openssl)
-vpp_LDFLAGS += $(call installed_libs_fn, openssl)
+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_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)"
+ifeq ("$(V)","1")
+vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 endif
 
-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)
-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 += 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_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'