[dpdk-stable] patch 'examples/kni: fix build with pkg-config' has been queued to LTS release 18.11.11
Kevin Traynor
ktraynor at redhat.com
Mon Nov 23 18:12:11 CET 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.11
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/27/20. 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/80741c6a2ce00ce9a46a9944caa0457d85378685
Thanks.
Kevin.
---
>From 80741c6a2ce00ce9a46a9944caa0457d85378685 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Sat, 14 Nov 2020 10:05:25 +0100
Subject: [PATCH] examples/kni: fix build with pkg-config
[ upstream commit 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 ]
rm -f build/kni build/kni-static build/kni-shared
test -d build && rmdir -p build || true
[...]
/usr/bin/ld: /tmp/cc72ssnK.o: undefined reference to symbol
'pthread_join@@GLIBC_2.2.5'
This example explicitly call pthread API and should be linked against
the pthread library.
Fixes: 724beb913b44 ("examples/kni: monitor and update link state continually")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
examples/kni/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/kni/Makefile b/examples/kni/Makefile
index b3d39a5778..c6e3b8eed0 100644
--- a/examples/kni/Makefile
+++ b/examples/kni/Makefile
@@ -26,4 +26,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
+LDFLAGS += -pthread
+
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-23 17:10:14.444258906 +0000
+++ 0019-examples-kni-fix-build-with-pkg-config.patch 2020-11-23 17:10:14.001061594 +0000
@@ -1 +1 @@
-From 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 Mon Sep 17 00:00:00 2001
+From 80741c6a2ce00ce9a46a9944caa0457d85378685 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index fa9fa85319..bbf3bcae12 100644
+index b3d39a5778..c6e3b8eed0 100644
@@ -28,2 +29,2 @@
-@@ -28,4 +28,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
- LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+@@ -26,4 +26,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+ LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
More information about the stable
mailing list