summaryrefslogtreecommitdiffstats
path: root/build-data
diff options
context:
space:
mode:
Diffstat (limited to 'build-data')
-rw-r--r--build-data/packages/build.mk12
-rw-r--r--build-data/packages/external.mk (renamed from build-data/packages/dpdk.mk)8
-rw-r--r--build-data/packages/vpp.mk8
3 files changed, 23 insertions, 5 deletions
diff --git a/build-data/packages/build.mk b/build-data/packages/build.mk
new file mode 100644
index 00000000000..7836ce2e803
--- /dev/null
+++ b/build-data/packages/build.mk
@@ -0,0 +1,12 @@
+# 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.
diff --git a/build-data/packages/dpdk.mk b/build-data/packages/external.mk
index ab2e39a804e..07daac09849 100644
--- a/build-data/packages/dpdk.mk
+++ b/build-data/packages/external.mk
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+external_source = build
+
ifneq (,$(findstring debug,$(TAG)))
DPDK_DEBUG=y
else
@@ -42,8 +44,8 @@ ifneq ($(DPDK_MAKE_EXTRA_ARGS),)
DPDK_MAKE_ARGS += DPDK_MAKE_EXTRA_ARGS="$(DPDK_MAKE_EXTRA_ARGS)"
endif
-dpdk_configure = echo
+external_configure = echo
-dpdk_make_args = $(DPDK_MAKE_ARGS) ebuild-build
+external_make_args = $(DPDK_MAKE_ARGS) -C external ebuild-build
-dpdk_install = make $(DPDK_MAKE_ARGS) ebuild-install
+external_install = make $(DPDK_MAKE_ARGS) -C external ebuild-install
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))