[dpdk-stable] patch 'build: remove redundant libs from pkgconfig' has been queued to LTS release 18.11.6
Kevin Traynor
ktraynor at redhat.com
Fri Nov 22 15:41:08 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 11/29/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/dc0b5308e3f03c6c2ffb92122e4a58610cc5fd5e
Thanks.
Kevin.
---
>From dc0b5308e3f03c6c2ffb92122e4a58610cc5fd5e Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 13 Aug 2019 01:03:53 +0200
Subject: [PATCH] build: remove redundant libs from pkgconfig
[ upstream commit 167d9c67975fb2207e03644ce7b5e23d56b73e70 ]
As explained in drivers/meson.build,
"
For the find_library() case (but not with dependency()) we also
need to specify the "-l" flags in pkgconfig_extra_libs variable
too, so that it can be reflected in the pkgconfig output for
static builds.
"
The commit e30b4e566f47 ("build: improve dependency handling")
must be followed up with this one in order to remove more
occurences of pkgconfig_extra_libs redundant with use of dependency().
Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Luca Boccassi <bluca at debian.org>
---
drivers/compress/isal/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index 94c10fd60..70eee68f7 100644
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -10,5 +10,4 @@ deps += 'bus_vdev'
sources = files('isal_compress_pmd.c', 'isal_compress_pmd_ops.c')
ext_deps += dep
-pkgconfig_extra_libs += '-lisal'
allow_experimental_apis = true
--
2.21.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-11-22 14:36:56.406503589 +0000
+++ 0022-build-remove-redundant-libs-from-pkgconfig.patch 2019-11-22 14:36:55.190149436 +0000
@@ -1 +1 @@
-From 167d9c67975fb2207e03644ce7b5e23d56b73e70 Mon Sep 17 00:00:00 2001
+From dc0b5308e3f03c6c2ffb92122e4a58610cc5fd5e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 167d9c67975fb2207e03644ce7b5e23d56b73e70 ]
+
@@ -20 +21,0 @@
-Cc: stable at dpdk.org
@@ -26,2 +27 @@
- drivers/net/af_xdp/meson.build | 1 -
- 2 files changed, 2 deletions(-)
+ 1 file changed, 1 deletion(-)
@@ -30 +30 @@
-index 67b5c4aae..25578880d 100644
+index 94c10fd60..70eee68f7 100644
@@ -33 +33 @@
-@@ -11,5 +11,4 @@ deps += 'bus_vdev'
+@@ -10,5 +10,4 @@ deps += 'bus_vdev'
@@ -39,10 +38,0 @@
-diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
-index ac679b92b..307aa0e38 100644
---- a/drivers/net/af_xdp/meson.build
-+++ b/drivers/net/af_xdp/meson.build
-@@ -11,5 +11,4 @@ endif
- if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
- ext_deps += bpf_dep
-- pkgconfig_extra_libs += '-lbpf'
- else
- build = false
More information about the stable
mailing list