Add support for AArch32

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

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index ff2c551..be10e17 100644 (file)
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,14 +1,16 @@
 vpp_configure_depend =                         \
        vppinfra-install                        \
-       dpdk-install                            \
        svm-install                             \
        vlib-api-install                        \
        vlib-install                            \
        vnet-install                            \
 
 # 
-vpp_configure_args = --with-q-platform=$(PLATFORM) \
-       --with-q-plugin-prefix=$(MU_BUILD_ROOT_DIR)/packages-$(PLATFORM)
+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))
@@ -16,8 +18,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 vpp_CPPFLAGS = $(call installed_includes_fn,   \
        vppinfra                                \
-       dpdk                                    \
-        openssl                                        \
        svm                                     \
        vlib                                    \
        vlib-api                                \
@@ -25,9 +25,24 @@ vpp_CPPFLAGS = $(call installed_includes_fn, \
 
 vpp_LDFLAGS = $(call installed_libs_fn,                \
        vppinfra                                \
-       dpdk                                    \
-       openssl                                 \
        svm                                     \
        vlib                                    \
        vlib-api                                \
        vnet)
+
+# 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)
+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
+endif