From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: pablo.de.lara.guarch@intel.com, declan.doherty@intel.com,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 1/2] crypto/aesni_gcm: add dependency version check
Date: Fri, 19 Apr 2019 11:01:12 +0100 [thread overview]
Message-ID: <20190419100113.31284-1-bruce.richardson@intel.com> (raw)
Message-ID: <20190419100112.Rpzmqu6_Nt8B-BqXcNSGYgQdruNUyj45Ou4uLdNRAqc@z> (raw)
The aesni_mb driver and the aesni_gcm driver both require the same version
of the IPSec_MB library, but only the former has a check of the library
found to see if it's the correct version. Add a similar check to the
aesni_gcm library's meson.build file, so that the auto-detection of
dependencies works correctly.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index 70f57ad73..7183cfcba 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -1,11 +1,22 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+IMB_required_ver = '0.52.0'
lib = cc.find_library('IPSec_MB', required: false)
if not lib.found()
build = false
else
ext_deps += lib
+
+ # 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('<' + IMB_required_ver))
+ message('IPSec_MB version >= @0@ is required, found version @1@'.format(
+ IMB_required_ver, imb_ver))
+ build = false
+ endif
endif
allow_experimental_apis = true
--
2.20.1
next reply other threads:[~2019-04-19 10:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-19 10:01 Bruce Richardson [this message]
2019-04-19 10:01 ` Bruce Richardson
2019-04-19 10:01 ` [dpdk-dev] [PATCH 2/2] crypto/aesni_mb: cleanup of version check code Bruce Richardson
2019-04-19 10:01 ` Bruce Richardson
2019-04-23 14:40 ` De Lara Guarch, Pablo
2019-04-23 14:40 ` De Lara Guarch, Pablo
2019-04-23 14:38 ` [dpdk-dev] [PATCH 1/2] crypto/aesni_gcm: add dependency version check De Lara Guarch, Pablo
2019-04-23 14:38 ` De Lara Guarch, Pablo
2019-04-23 14:45 ` Bruce Richardson
2019-04-23 14:45 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190419100113.31284-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=pablo.de.lara.guarch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).