From 4a6cb83d334e391f85332ea38a2e467ac7743e4b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 18 Sep 2018 18:41:38 +0200 Subject: rename vpp-dpdk-dev to vpp-ext-deps We need to have new tenants in the development package. This is first of series of patches which will allow us to have multiple external libs and tools packaged for developer's convenience. Change-Id: I884bd75fba96005bbf8cea92774682b2228e0e22 Signed-off-by: Damjan Marion --- build-data/packages/vpp.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build-data/packages/vpp.mk') diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 9980c663666..185a4efc511 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -19,18 +19,22 @@ 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 += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../dpdk" +vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)" # 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 +vpp_configure_depend += external-install vpp_configure = \ cd $(PACKAGE_BUILD_DIR) && \ $(CMAKE) -G Ninja $(vpp_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE)) -- cgit 1.2.3-korg