X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms%2Fvpp.mk;h=5e4980aad1280c86b5779147294a94c34eeeefdf;hb=6a5adc369591fcac2447e9809deaa22f56b53911;hp=9f01a656e0bea233c14834963b66e6b4ab9929ed;hpb=ba3c77364cc8b7dfb136e955458177e1a9a14c98;p=vpp.git

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 9f01a656e0b..5e4980aad12 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -26,33 +26,36 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp
+vpp_root_packages = vpp vom
 
 # DPDK configuration parameters
+# vpp_uses_dpdk_mlx4_pmd = yes
 # vpp_uses_dpdk_mlx5_pmd = yes
 # vpp_uses_external_dpdk = yes
 # vpp_dpdk_inc_dir = /usr/include/dpdk
 # vpp_dpdk_lib_dir = /usr/lib
 # vpp_dpdk_shared_lib = yes
 
-vpp_configure_args_vpp =
+# Use '--without-libnuma' for non-numa aware architecture
+# Use '--enable-dlmalloc' to use dlmalloc instead of mheap
+vpp_configure_args_vpp = --enable-dlmalloc
+sample-plugin_configure_args_vpp = --enable-dlmalloc
 
 # load balancer plugin is not portable on 32 bit platform
 ifeq ($(MACHINE),i686)
 vpp_configure_args_vpp += --disable-lb-plugin
 endif
 
-# To disable the VPP object model build - and save about half the build time -
-# uncomment the following...
-# vpp_configure_args_vpp += --disable-vom
-
 vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
 	-fstack-protector-all -fPIC -Werror
+vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
+	-fstack-protector-all -fPIC -Werror
 vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
 	-fstack-protector-all -fPIC -Werror
 
 vpp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
-vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
+vpp_TAG_CXXFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
+vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror -pie -Wl,-z,now
 
 vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 vpp_clang_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror