patch 'examples/ntb: fix build dependency' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/30/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/55935076628619db56dcafd2c726110e246e8411

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 55935076628619db56dcafd2c726110e246e8411 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 16 Nov 2021 21:51:35 +0100
Subject: [PATCH] examples/ntb: fix build dependency
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 2c7302145c0405b056850382731e5352d44f7d64 ]

Caught while building with -Ddisable_drivers=*/*.
This example requires raw/ntb specific API.
Fix dependency to avoid a compilation error:

FAILED: examples/c590b3c@@dpdk-ntb at exe/ntb_ntb_fwd.c.o
ccache gcc -Iexamples/c590b3c@@dpdk-ntb at exe -Iexamples -I../examples
  -Iexamples/ntb -I../examples/ntb -I. -I../ -Iconfig -I../config
  -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include
  -I../lib/eal/linux/include -Ilib/eal/x86/include
  -I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common
  -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs
  -Ilib/telemetry/../metrics -I../lib/telemetry/../metrics
  -Ilib/telemetry -I../lib/telemetry -Ilib/mempool -I../lib/mempool
  -Ilib/ring -I../lib/ring -Ilib/net -I../lib/net -Ilib/mbuf
  -I../lib/mbuf -Ilib/ethdev -I../lib/ethdev -Ilib/meter
  -I../lib/meter -Ilib/cmdline -I../lib/cmdline -Ilib/rawdev
  -I../lib/rawdev -fdiagnostics-color=always -pipe -Wall
  -Winvalid-pch -Werror -O2 -g -include rte_config.h -Wextra
  -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral
  -Wformat-security -Wmissing-declarations -Wmissing-prototypes
  -Wnested-externs -Wold-style-definition -Wpointer-arith
  -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings
  -Wno-missing-field-initializers -D_GNU_SOURCE -march=corei7
  -Wno-format-truncation -D_FILE_OFFSET_BITS=64
  -DALLOW_EXPERIMENTAL_API  -MD
  -MQ 'examples/c590b3c@@dpdk-ntb at exe/ntb_ntb_fwd.c.o'
  -MF 'examples/c590b3c@@dpdk-ntb at exe/ntb_ntb_fwd.c.o.d'
  -o 'examples/c590b3c@@dpdk-ntb at exe/ntb_ntb_fwd.c.o'
  -c ../examples/ntb/ntb_fwd.c
../examples/ntb/ntb_fwd.c:21:10: fatal error: rte_pmd_ntb.h:
  No such file or directory
 #include <rte_pmd_ntb.h>
          ^~~~~~~~~~~~~~~
compilation terminated.

Fixes: 5194299d6ef5 ("examples/ntb: support more functions")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 examples/ntb/meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build
index 02be9fc80d..3da983badb 100644
--- a/examples/ntb/meson.build
+++ b/examples/ntb/meson.build
@@ -12,11 +12,8 @@ if not is_linux
 	subdir_done()
 endif
 
-deps += 'rawdev'
+deps += ['rawdev', 'raw_ntb']
 cflags += ['-D_FILE_OFFSET_BITS=64']
 sources = files(
 	'ntb_fwd.c'
 )
-if dpdk_conf.has('RTE_RAW_NTB')
-	deps += 'raw_ntb'
-endif
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:05.444645244 +0800
+++ 0040-examples-ntb-fix-build-dependency.patch	2021-11-28 22:41:03.323540920 +0800
@@ -1 +1 @@
-From 2c7302145c0405b056850382731e5352d44f7d64 Mon Sep 17 00:00:00 2001
+From 55935076628619db56dcafd2c726110e246e8411 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 2c7302145c0405b056850382731e5352d44f7d64 ]
@@ -42 +44,0 @@
-Cc: stable at dpdk.org
@@ -50 +52 @@
-index 37899dfeb6..18eaffdf21 100644
+index 02be9fc80d..3da983badb 100644
@@ -54 +56 @@
-     subdir_done()
+ 	subdir_done()
@@ -61 +63 @@
-         'ntb_fwd.c',
+ 	'ntb_fwd.c'
@@ -64 +66 @@
--    deps += 'raw_ntb'
+-	deps += 'raw_ntb'