[dpdk-stable] patch 'crypto/kasumi: fix dependency check' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8ec3ea45d73239f05f00bb70730352766159e2dd

Thanks.

Kevin Traynor

---
>From 8ec3ea45d73239f05f00bb70730352766159e2dd Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 1 May 2019 16:53:28 +0100
Subject: [PATCH] crypto/kasumi: fix dependency check

[ upstream commit 408bb7b07becf6002e92982888e020734c1f0241 ]

The check for the kasumi library dependency did not check for the include
file needed for compilation. It's also recommended when looking for a
library to use the name without the lib prefix.

Fixes: 2ec2d46c6255 ("crypto/kasumi: enable meson build")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/crypto/kasumi/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index a09b0e251..9a8956a03 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -2,11 +2,11 @@
 # Copyright(c) 2018 Intel Corporation
 
-lib = cc.find_library('libsso_kasumi', required: false)
-if not lib.found()
+lib = cc.find_library('sso_kasumi', required: false)
+if not lib.found() or not cc.has_header('sso_kasumi.h')
 	build = false
-else
-	ext_deps += lib
+	subdir_done()
 endif
 
+ext_deps += lib
 sources = files('rte_kasumi_pmd.c', 'rte_kasumi_pmd_ops.c')
 deps += ['bus_vdev']
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:08.009533142 +0100
+++ 0044-crypto-kasumi-fix-dependency-check.patch	2019-05-08 11:05:05.852932280 +0100
@@ -1 +1 @@
-From 408bb7b07becf6002e92982888e020734c1f0241 Mon Sep 17 00:00:00 2001
+From 8ec3ea45d73239f05f00bb70730352766159e2dd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 408bb7b07becf6002e92982888e020734c1f0241 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 80f13cd24..0fa301740 100644
+index a09b0e251..9a8956a03 100644
@@ -22 +23 @@
-@@ -2,12 +2,12 @@
+@@ -2,11 +2,11 @@
@@ -35 +35,0 @@
- allow_experimental_apis = true