DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: pablo.de.lara.guarch@intel.com, dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check
Date: Tue, 23 Apr 2019 16:43:55 +0100	[thread overview]
Message-ID: <20190423154357.29877-2-bruce.richardson@intel.com> (raw)
Message-ID: <20190423154355.G6-Ay1EqtFOsqlsU37-vdI9mMFAO2feXdL-TXFzerf8@z> (raw)
In-Reply-To: <20190423154357.29877-1-bruce.richardson@intel.com>

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 by meson 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


  parent reply	other threads:[~2019-04-23 15:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23 15:43 [dpdk-dev] [PATCH v2 0/3] improve IPsec_MB dependency checks Bruce Richardson
2019-04-23 15:43 ` Bruce Richardson
2019-04-23 15:43 ` Bruce Richardson [this message]
2019-04-23 15:43   ` [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check Bruce Richardson
2019-04-24  7:53   ` De Lara Guarch, Pablo
2019-04-24  7:53     ` De Lara Guarch, Pablo
2019-04-24  9:19   ` Luca Boccassi
2019-04-24  9:19     ` Luca Boccassi
2019-04-24 10:38     ` Bruce Richardson
2019-04-24 10:38       ` Bruce Richardson
2019-04-24 10:52       ` Luca Boccassi
2019-04-24 10:52         ` Luca Boccassi
2019-04-23 15:43 ` [dpdk-dev] [PATCH v2 2/3] crypto/aesni_mb: cleanup of version check code Bruce Richardson
2019-04-23 15:43   ` Bruce Richardson
2019-04-23 15:43 ` [dpdk-dev] [PATCH v2 3/3] crypto/aesni_gcm: add check for build dependency Bruce Richardson
2019-04-23 15:43   ` Bruce Richardson
2019-04-24  7:53   ` De Lara Guarch, Pablo
2019-04-24  7:53     ` De Lara Guarch, Pablo
2019-04-24 10:52 ` [dpdk-dev] [PATCH v2 0/3] improve IPsec_MB dependency checks Luca Boccassi
2019-04-24 10:52   ` Luca Boccassi
2019-04-30  6:48   ` Akhil Goyal
2019-04-30  6:48     ` Akhil Goyal

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=20190423154357.29877-2-bruce.richardson@intel.com \
    --to=bruce.richardson@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).