[dpdk-stable] patch 'app: fix build with extra include paths' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/2b5df8dcfb9cbbec84b5d751b84a905dd82fd672

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 2b5df8dcfb9cbbec84b5d751b84a905dd82fd672 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 15 Jan 2021 11:10:47 +0000
Subject: [PATCH] app: fix build with extra include paths

[ upstream commit 64fd2124301eb246f12c316f9f619e36cf6d1bdc ]

The "includes" variable in the app/meson.build file was ignored when
building the executable, meaning that apps couldn't pass additional
include paths directly back. Fix this to align with drivers and libs.

Fixes: fa036e70d794 ("app: generalize meson build")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 app/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/meson.build b/app/meson.build
index 71109cc422..65d6bc7f85 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -62,6 +62,7 @@ foreach app:apps
 				c_args: cflags,
 				link_whole: link_libs,
 				dependencies: dep_objs,
+				include_directories: includes,
 				install_rpath: join_paths(get_option('prefix'),
 						 driver_install_path),
 				install: true)
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:31.419986749 +0100
+++ 0081-app-fix-build-with-extra-include-paths.patch	2021-02-04 12:04:28.078789775 +0100
@@ -1 +1 @@
-From 64fd2124301eb246f12c316f9f619e36cf6d1bdc Mon Sep 17 00:00:00 2001
+From 2b5df8dcfb9cbbec84b5d751b84a905dd82fd672 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 64fd2124301eb246f12c316f9f619e36cf6d1bdc ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 903117b866..87fc195dbf 100644
+index 71109cc422..65d6bc7f85 100644
@@ -23,2 +24,2 @@
-@@ -66,6 +66,7 @@ foreach app:apps
- 				link_args: ldflags,
+@@ -62,6 +62,7 @@ foreach app:apps
+ 				c_args: cflags,