[dpdk-stable] patch 'net/szedata2: fix dependency check' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 3 19:26:39 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/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/ad84f96f137acdbcba0383a0b5ffecc804502732

Thanks.

Kevin.

---
>From ad84f96f137acdbcba0383a0b5ffecc804502732 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Sat, 14 Sep 2019 11:37:00 +0200
Subject: [PATCH] net/szedata2: fix dependency check

[ upstream commit 07737474ece260fc4adbc46a0b2e7352887fa0c2 ]

The library libsze2 provides a pkg-config file: libsze2.pc.
Looking for this .pc file - with dependency() - is preferred
than looking for the library - with cc.find_library().

If the library is not installed in a standard path,
it can be found thanks to PKG_CONFIG_PATH variable.
The previous solution required to use CFLAGS and LDFLAGS
environment variables.

Fixes: 508cfe6be9f1 ("net/szedata2: add to meson build")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Jan Remes <remes at netcope.com>
---
 drivers/net/szedata2/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index da3733743..a64d38fa0 100644
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -2,5 +2,5 @@
 # Copyright(c) 2018 Intel Corporation
 
-dep = cc.find_library('sze2', required: false)
+dep = dependency('libsze2', required: false)
 build = dep.found()
 ext_deps += dep
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:53.566254345 +0000
+++ 0030-net-szedata2-fix-dependency-check.patch	2019-12-03 17:29:51.749749974 +0000
@@ -1 +1 @@
-From 07737474ece260fc4adbc46a0b2e7352887fa0c2 Mon Sep 17 00:00:00 2001
+From ad84f96f137acdbcba0383a0b5ffecc804502732 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 07737474ece260fc4adbc46a0b2e7352887fa0c2 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 032b42518..b53fcbc59 100644
+index da3733743..a64d38fa0 100644
@@ -34 +35 @@
- reason = 'missing dependency, "libsze2"'
+ ext_deps += dep



More information about the stable mailing list