aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2017-11-06 16:06:05 -0500
committerChris Luke <chris_luke@comcast.com>2017-11-06 22:28:51 +0000
commit7b0c6737ed1e58d7902a513046e1b617a146cf23 (patch)
tree5528578ebf7250d2bb0ba8d771fe3de4cb58f978
parentc97a7398fc465c480a3ac66cf4b0f91a034ed564 (diff)
Add --disable-vom config option
The vpp object model consumes more than half of the entire [initial] build time, so it's worth adding a config option. Change-Id: I86ad41f78160d93835804235b8b4a3fc7988f2f7 Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--build-data/platforms/vpp.mk8
-rw-r--r--src/Makefile.am4
-rw-r--r--src/configure.ac1
3 files changed, 11 insertions, 2 deletions
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 7745717483a..f764a1f9ae5 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -45,11 +45,17 @@ vpp_root_packages = vpp
# vpp_dpdk_lib_dir = /usr/lib
# vpp_dpdk_shared_lib = yes
+vpp_configure_args_vpp =
+
# load balancer plugin is not portable on 32 bit platform
ifeq ($(MACHINE),i686)
-vpp_configure_args_vpp = --disable-lb-plugin
+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 -march=$(MARCH) \
-fstack-protector-all -fPIC -Werror
vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b6818f2098..6f146fea4a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ include uri.am
include vcl.am
SUBDIRS += plugins
+SUBDIRS += vpp-api/vapi
if ENABLE_PAPI
include vpp-api.am
@@ -82,8 +83,9 @@ if ENABLE_JAPI
SUBDIRS += vpp-api/java
endif
-SUBDIRS += vpp-api/vapi
+if ENABLE_VOM
SUBDIRS += vpp-api/vom
+endif
###############################################################################
# API
diff --git a/src/configure.ac b/src/configure.ac
index 150930f03e2..8b79cff224f 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -134,6 +134,7 @@ DISABLE_ARG(vlib, [Disable vlib and dependant libs and binaries])
DISABLE_ARG(svm, [Disable svm and dependant libs and binaries])
DISABLE_ARG(papi, [Disable Python API bindings])
DISABLE_ARG(japi, [Disable Java API bindings])
+DISABLE_ARG(vom, [Disable VPP object model bindings])
# --with-X