aboutsummaryrefslogtreecommitdiffstats
path: root/build-data
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-16 22:06:10 +0100
committerFlorin Coras <florin.coras@gmail.com>2017-01-16 23:19:46 +0000
commita9a951f8e5ed6e172fbfbdbb6cb690c67fa2f715 (patch)
tree1a976cda2a242e013101124b9ed686a2811ae9a1 /build-data
parent597d3c4121b4dd557328c11debb42927a45d52fb (diff)
Add --without-libssl configure parameter
This replaces --without-ipsec and --without-ipv6sr and allows other parts of the code to be disabled if libssl is not available. Change-Id: Id97ff3685a7924d7f86622952e0405d94ceb5957 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data')
-rw-r--r--build-data/platforms/arm32.mk4
-rw-r--r--build-data/platforms/dpaa2.mk8
-rw-r--r--build-data/platforms/qppc.mk4
-rw-r--r--build-data/platforms/thunder.mk4
4 files changed, 10 insertions, 10 deletions
diff --git a/build-data/platforms/arm32.mk b/build-data/platforms/arm32.mk
index 7b80061b2ea..47d4ad5ada7 100644
--- a/build-data/platforms/arm32.mk
+++ b/build-data/platforms/arm32.mk
@@ -22,8 +22,8 @@ arm32_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
jvpp gmod
vlib_configure_args_arm32 = --with-pre-data=128
-vnet_configure_args_arm32 = --with-dpdk --without-ipsec --without-ipv6sr
-vpp_configure_args_arm32 = --with-dpdk --without-ipsec --without-ipv6sr
+vnet_configure_args_arm32 = --with-dpdk --without-libssl
+vpp_configure_args_arm32 = --with-dpdk --without-libssl
arm32_dpdk_arch = "armv7a"
arm32_dpdk_target = "arm-armv7a-linuxapp-gcc"
diff --git a/build-data/platforms/dpaa2.mk b/build-data/platforms/dpaa2.mk
index 0ec627a48ef..2d4745acc56 100644
--- a/build-data/platforms/dpaa2.mk
+++ b/build-data/platforms/dpaa2.mk
@@ -42,10 +42,10 @@ dpaa2_dpdk_make_extra_args = "CROSS=$(dpaa2_target)- DPDK_PKTMBUF_HEADROOM=256"
endif
endif
-vpp_configure_args_dpaa2 = --with-dpdk --without-ipsec \
- --without-ipv6sr --with-sysroot=$(SYSROOT)
-vnet_configure_args_dpaa2 = --with-dpdk --without-ipsec \
- --without-ipv6sr --with-sysroot=$(SYSROOT)
+vpp_configure_args_dpaa2 = --with-dpdk --without-libssl \
+ --with-sysroot=$(SYSROOT)
+vnet_configure_args_dpaa2 = --with-dpdk --without-libssl \
+ --with-sysroot=$(SYSROOT)
# Set these parameters carefully. The vlib_buffer_t is 256 bytes, i.e.
vlib_configure_args_dpaa2 = --with-pre-data=256
diff --git a/build-data/platforms/qppc.mk b/build-data/platforms/qppc.mk
index 244747e7fa4..983684fc6a3 100644
--- a/build-data/platforms/qppc.mk
+++ b/build-data/platforms/qppc.mk
@@ -11,10 +11,10 @@ qppc_root_packages = vppinfra vlib vlib-api vnet svm \
vpp vpp-api-test
vnet_configure_args_qppc = \
- --without-ipsec --without-ipv6sr
+ --without-libssl
vpp_configure_args_qppc = \
- --without-ipsec --without-ipv6sr
+ --without-libssl
vlib_configure_args_qppc = --with-pre-data=128
diff --git a/build-data/platforms/thunder.mk b/build-data/platforms/thunder.mk
index f891f4a1589..31b6a510576 100644
--- a/build-data/platforms/thunder.mk
+++ b/build-data/platforms/thunder.mk
@@ -15,10 +15,10 @@ thunder_root_packages = vppinfra vlib-cavium-dpdk vnet-cavium-dpdk cavium-dpdk \
vpp-cavium-dpdk vpp-api-test-cavium-dpdk
vnet-cavium-dpdk_configure_args_thunder = \
- --with-dpdk --without-ipsec --without-ipv6sr
+ --with-dpdk --without-libssl
vpp-cavium-dpdk_configure_args_thunder = \
- --with-dpdk --without-ipsec --without-ipv6sr
+ --with-dpdk --without-libssl
cavium-dpdk_configure_args_thunder = --with-headroom=256