From 9235d43d231b103285be539ebe64d37620fe9930 Mon Sep 17 00:00:00 2001 From: PiotrX Kleski Date: Mon, 12 Oct 2020 15:33:11 +0200 Subject: crypto: fixed ipsec_mb lib dependencies Type: fix This patch re-enables libIPSec_MB build for the ipsecmb crypto engine plugin. Also since DPDK meson build relies on system installed libIPSec_MB.so that may be inconsistent with VPP compiled one (system installed version vs VPP locally compiled version for example), this patch also disables all libIPSec_MB dependant PMDs from DPDK build. Also ipsec-mb version is incresed to 0.54. Signed-off-by: PiotrX Kleski Reviewed-by: Fan Zhang Change-Id: I2ff9e7cd0c35cff9fa642895301a26a5350ea94e --- src/plugins/dpdk/CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src') diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index 0236172792d..79829401c93 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -82,21 +82,6 @@ endif() vpp_plugin_find_library(dpdk NUMA_LIB "numa") list(APPEND DPDK_LINK_LIBRARIES ${NUMA_LIB}) -############################################################################## -# AESNI libraries -############################################################################## -if(DPDK_RTE_LIBRTE_PMD_AESNI_MB OR DPDK_RTE_LIBRTE_PMD_AESNI_GCM) - if(DPDK_IS_SHARED_LIB) - vpp_plugin_find_library(dpdk IPSECMB_LIB "libIPSec_MB.so") - list(APPEND DPDK_LINK_LIBRARIES "${IPSECMB_LIB}") - else() - vpp_plugin_find_library(dpdk IPSECMB_LIB "libIPSec_MB.a") - get_filename_component(IPSECMB_LIB_DIR ${IPSECMB_LIB} DIRECTORY) - string_append(DPDK_LINK_FLAGS "-L${IPSECMB_LIB_DIR}") - string_append(DPDK_LINK_FLAGS "-Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a") - endif() -endif() - ############################################################################## # Mellanox libraries ############################################################################## -- cgit 1.2.3-korg