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 3/3] crypto/aesni_gcm: add check for build dependency
Date: Tue, 23 Apr 2019 16:43:57 +0100 [thread overview]
Message-ID: <20190423154357.29877-4-bruce.richardson@intel.com> (raw)
Message-ID: <20190423154357.Aj00Fe4ACp0FsUqaMZ7VgYFd641EV3U65hcGquE26e8@z> (raw)
In-Reply-To: <20190423154357.29877-1-bruce.richardson@intel.com>
The aesni_mb driver has a check in its Makefile for the correct version of
the IPsec_MB library, but this check was missed for the aesni_gcm driver.
Add this check to the makefile, removing an unnecessary assignment in the
process.
Suggested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/crypto/aesni_gcm/Makefile | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile
index 9241ad762..39eff3db0 100644
--- a/drivers/crypto/aesni_gcm/Makefile
+++ b/drivers/crypto/aesni_gcm/Makefile
@@ -23,11 +23,24 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
+IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+ $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
+ head -n1 | cut -d'"' -f2)
+
+# Detect library version
+IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
+IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
+
+ifeq ($(IMB_VERSION),)
+$(error "IPSec_MB version >= 0.52 is required")
+endif
+
+ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
+$(error "IPSec_MB version >= 0.52 is required")
+endif
+
# library source files
SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c
-# export include files
-SYMLINK-y-include +=
-
include $(RTE_SDK)/mk/rte.lib.mk
--
2.20.1
next prev 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 ` [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check 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 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 ` Bruce Richardson [this message]
2019-04-23 15:43 ` [dpdk-dev] [PATCH v2 3/3] crypto/aesni_gcm: add check for build dependency 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-4-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).