diff options
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/vom.mk | 45 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 2 |
2 files changed, 1 insertions, 46 deletions
diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk deleted file mode 100644 index f284473beb5..00000000000 --- a/build-data/packages/vom.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2017-2018 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. - -vom_configure_depend = vpp-install -vom_source = extras -vom_configure_subdir = vom - -ifneq ($(shell which cmake3),) -CMAKE?=cmake3 -else -CMAKE?=cmake -endif - -vom_cmake_args ?= -vom_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) -vom_cmake_args += -DCMAKE_CXX_FLAGS="$($(TAG)_TAG_CPPFLAGS)" -vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" - -# Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) -vom_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" -endif - -vom_configure = \ - cd $(PACKAGE_BUILD_DIR) && \ - $(CMAKE) -G Ninja $(vom_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) - -vom_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS) - -vom_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install - -vom-package-deb: vom-install - @$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vom -- package - @find $(PACKAGE_BUILD_DIR)/vom -name '*.deb' -exec mv {} $(CURDIR) \; diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index f71427c1ae6..83d0fe5840b 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -20,7 +20,7 @@ ifeq ($(TARGET_PLATFORM),thunderx) vpp_dpdk_target = arm64-thunderx-linuxapp-gcc endif -vpp_root_packages = vpp vom +vpp_root_packages = vpp vpp_debug_TAG_BUILD_TYPE = debug vpp_TAG_BUILD_TYPE = release |