[dpdk-stable] patch 'examples/power: fix FreeBSD meson lib dependency' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

Thanks.

Kevin Traynor

---
>From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt at intel.com>
Date: Fri, 12 Jul 2019 10:06:51 +0100
Subject: [PATCH] examples/power: fix FreeBSD meson lib dependency

[ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ]

Samples apps that depend on the power library should not build if
the power library is not present. So now the following apps will
check to see if it's built, else skip building.
* l3fwd-pwer
* vm_power_manager
* guest_cli

Fixes: e0130788576f ("examples/power: support meson/ninja build")
Fixes: 89f0711f9ddf ("examples: build some samples with meson")

Signed-off-by: David Hunt <david.hunt at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/l3fwd-power/meson.build                |  6 ++++--
 examples/vm_power_manager/guest_cli/meson.build |  5 +++++
 examples/vm_power_manager/meson.build           | 10 +++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index a3c5c2f14..257f290e8 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -7,7 +7,9 @@
 # DPDK instance, use 'make'
 
-if host_machine.system() != 'linux'
-	build = false
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+        build = false
+        subdir_done()
 endif
+
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash']
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index 9e821ceb8..38bd8d837 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -11,4 +11,9 @@
 name = 'guest_cli'
 
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+        build = false
+        subdir_done()
+endif
+
 deps += ['power']
 
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index f98445bc6..20a4a05b3 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -7,4 +7,11 @@
 # DPDK instance, use 'make'
 
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+	build = false
+	subdir_done()
+endif
+
+deps += ['power']
+
 if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
 	deps += ['pmd_bnxt']
@@ -19,7 +26,4 @@ if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
 endif
 
-deps += ['power']
-
-
 sources = files(
 	'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.203620627 +0100
+++ 0042-examples-power-fix-FreeBSD-meson-lib-dependency.patch	2019-08-27 09:40:10.938143951 +0100
@@ -1 +1 @@
-From 16015fd65a5532604139d4c597e1c16027209c4e Mon Sep 17 00:00:00 2001
+From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index b38a7a0d7..d5a3d4bb2 100644
+index a3c5c2f14..257f290e8 100644
@@ -32 +33 @@
--if not is_linux
+-if host_machine.system() != 'linux'
@@ -40 +41 @@
- deps += ['power', 'timer', 'lpm', 'hash', 'metrics']
+ deps += ['power', 'timer', 'lpm', 'hash']