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 <bruce.richardson@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>

diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index fbc4878..7c1eb3f 100644 (file)
--- 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<intel-ipsec-mb.h>').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<intel-ipsec-mb.h>').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']