diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-04-25 19:11:15 +0200 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-04-27 11:35:07 +0000 |
| commit | 164e5f8c63652028ecb9c3570e1ea8618b163071 (patch) | |
| tree | 7423f5abbc61b761df9a679c7974f17613736020 /build-data | |
| parent | aa682a39b76ee043f65313f23e134bf18fe7a47e (diff) | |
Move VOM to extras/vom
Change-Id: Iea174f03dfba3bd06024db0f0cc373532300dcae
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/vom.mk | 6 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk new file mode 100644 index 00000000000..a156ea8671c --- /dev/null +++ b/build-data/packages/vom.mk @@ -0,0 +1,6 @@ +vom_configure_depend = vpp-install +vom_source = extras +vom_configure_subdir = vom +vom_CPPFLAGS = $(call installed_includes_fn, vpp) +vom_LDFLAGS = $(call installed_libs_fn, vpp) + diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 320609ded2b..57501819c7e 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -26,7 +26,7 @@ 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_mlx5_pmd = yes @@ -42,10 +42,6 @@ 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 \ |