From 28e3db9dd617324a3196f369788d62cc72b5903b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 1 Apr 2016 12:35:17 +0200 Subject: Add options to link with external DPDK tree By uncommenting following lines in the build-data/platforms/vpp.mk VPP links nicely with packaged DPDK 2.2 distributed with Ubuntu 16.04 LTS. vpp_uses_external_dpdk = yes vpp_dpdk_inc_dir = /usr/include/dpdk vpp_dpdk_lib_dir = /usr/lib vpp_dpdk_shared_lib = yes Change-Id: Id5b7d95bac6aa60341933b92e86d949a9abf1a5d Signed-off-by: Damjan Marion --- build-data/packages/vpp.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'build-data/packages/vpp.mk') diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 9ccf6901dd7..f96235f4f0c 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -6,7 +6,11 @@ vpp_configure_depend = \ vnet-install \ # -vpp_configure_args = +ifeq ($($(PLATFORM)_dpdk_shared_lib),yes) +vpp_configure_args = --enable-dpdk-shared +else +vpp_configure_args = +endif # Platform dependent configure flags vpp_configure_args += $(vpp_configure_args_$(PLATFORM)) @@ -29,7 +33,12 @@ vpp_LDFLAGS = $(call installed_libs_fn, \ 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) endif +endif -- cgit 1.2.3-korg