diff options
Diffstat (limited to 'build-data/packages')
| -rw-r--r-- | build-data/packages/vnet.mk | 8 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk index 46d3c1d42dc..cafb93933bd 100644 --- a/build-data/packages/vnet.mk +++ b/build-data/packages/vnet.mk @@ -6,14 +6,12 @@ vnet_configure_depend = \ vnet_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api) vnet_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api) @@ -25,6 +23,12 @@ endif # Platform dependent configure flags vnet_configure_args += $(vnet_configure_args_$(PLATFORM)) +# include & link with openssl only if needed +ifneq ($($(PLATFORM)_uses_openssl),no) +vnet_CPPFLAGS += $(call installed_includes_fn, openssl) +vnet_LDFLAGS += $(call installed_libs_fn, openssl) +endif + ifneq ($($(PLATFORM)_uses_dpdk),no) ifeq ($($(PLATFORM)_uses_external_dpdk),yes) vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index f96235f4f0c..be10e17d200 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -18,7 +18,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM)) vpp_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api \ @@ -26,12 +25,17 @@ vpp_CPPFLAGS = $(call installed_includes_fn, \ vpp_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - 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) |