From 3998db2db8651cec0413c2e9d5e2e2c67d0af956 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 23 Apr 2019 16:43:56 +0100 Subject: [PATCH] crypto/aesni_mb: cleanup version check The version check for the IPSec_MB library present in the aesni_gcm library's meson.build file is a little cleaner than that given here, so update this one so that both work identically. While one could use the checks done in the other right now, potentially in future they may have different version dependencies, or may be compiled in different orders, so keep the code duplicated for safety, since it's only a few lines. Signed-off-by: Bruce Richardson Acked-by: Pablo de Lara Acked-by: Luca Boccassi --- drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build index fbc4878afc..7c1eb3f86e 100644 --- a/drivers/crypto/aesni_mb/meson.build +++ b/drivers/crypto/aesni_mb/meson.build @@ -1,25 +1,25 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -IPSec_MB_ver_0_52 = '0.52.0' + +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib - imb_arr = cc.get_define('IMB_VERSION_STR', - prefix : '#include').split('"') - - imb_ver = ''.join(imb_arr) + # version comes with quotes, so we split based on " and take the middle + imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include').split('"')[1] - if (imb_ver == '') or (imb_ver.version_compare('<' + IPSec_MB_ver_0_52)) - message('IPSec_MB version >= 0.52 is required') + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) + message('IPSec_MB version >= @0@ is required, found version @1@'.format( + IMB_required_ver, imb_ver)) build = false - else - sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') endif endif +sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') allow_experimental_apis = true deps += ['bus_vdev'] -- 2.20.1