[dpdk-stable] patch 'examples/l2fwd-crypto: fix build with pkg-config' has been queued to LTS release 18.11.11

[Kevin Traynor]

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/1ceffb2318882648926fd29fa9023da6d3a71186

Thanks.

Kevin.

---
>From 1ceffb2318882648926fd29fa9023da6d3a71186 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 08881ff183..4c085ab221 100644
--- a/examples/l2fwd-crypto/Makefile
+++ b/examples/l2fwd-crypto/Makefile
@@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
 LDFLAGS_STATIC = -Wl,-Bstatic $(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.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.465625868 +0000
+++ 0020-examples-l2fwd-crypto-fix-build-with-pkg-config.patch	2020-11-23 17:10:14.001061594 +0000
@@ -1 +1 @@
-From bcd3004381b09adaa1ab7ceb9c0592e640fb210c Mon Sep 17 00:00:00 2001
+From 1ceffb2318882648926fd29fa9023da6d3a71186 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 08881ff183..4c085ab221 100644
@@ -28,2 +29,2 @@
-@@ -27,4 +27,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
- LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+@@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+ LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)