[dpdk-stable] patch 'examples/l2fwd-crypto: fix build with pkg-config' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Nov 17 12:14:12 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.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/19/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/763e52f711e57a227f90f4c9ff15ff5a149fbdcf
Thanks.
Luca Boccassi
---
>From 763e52f711e57a227f90f4c9ff15ff5a149fbdcf Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Sat, 14 Nov 2020 10:05:26 +0100
Subject: [PATCH] examples/l2fwd-crypto: fix build with pkg-config
[ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ]
Two issues fixed here.
First add the experimental flag.
Then fix a link issue with the crypto scheduler driver:
/usr/bin/ld: /tmp/cchr7aHA.o: in function `main':
main.c:(.text.startup+0x1673): undefined reference to
`rte_cryptodev_scheduler_workers_get'
collect2: error: ld returned 1 exit status
Fixes: e3bcb99a5e13 ("examples/l2fwd-crypto: limit number of sessions")
Fixes: 261bbff75e34 ("examples: use separate crypto session mempools")
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
examples/l2fwd-crypto/Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile
index cdbb91a1e6..cafe778fc6 100644
--- a/examples/l2fwd-crypto/Makefile
+++ b/examples/l2fwd-crypto/Makefile
@@ -24,6 +24,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CONFIG_DEFINES = $(shell $(CC) $(CFLAGS) -dM -E - < /dev/null)
+ifneq ($(findstring RTE_CRYPTO_SCHEDULER,$(CONFIG_DEFINES)),)
+LDFLAGS_SHARED += -lrte_crypto_scheduler
+endif
+
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-17 11:13:14.579518452 +0000
+++ 0038-examples-l2fwd-crypto-fix-build-with-pkg-config.patch 2020-11-17 11:13:12.953117254 +0000
@@ -1 +1 @@
-From bcd3004381b09adaa1ab7ceb9c0592e640fb210c Mon Sep 17 00:00:00 2001
+From 763e52f711e57a227f90f4c9ff15ff5a149fbdcf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 4953ee2b95..7731eccd03 100644
+index cdbb91a1e6..cafe778fc6 100644
@@ -28 +29 @@
-@@ -26,6 +26,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+@@ -24,6 +24,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
More information about the stable
mailing list