From: David Hunt <david.hunt@intel.com>
To: dev@dpdk.org
Cc: david.hunt@intel.com, bruce.richardson@intel.com, ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v1] examples/power: fix FreeBSD meson lib dependency
Date: Fri, 12 Jul 2019 10:06:51 +0100 [thread overview]
Message-ID: <20190712090651.11824-1-david.hunt@intel.com> (raw)
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@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 b38a7a0d7..d5a3d4bb2 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -6,9 +6,11 @@
# To build this example as a standalone application with an already-installed
# DPDK instance, use 'make'
-if not is_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', 'metrics']
sources = files(
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
@@ -10,6 +10,11 @@
# vm_power_manager app because of the way the directories are parsed.
name = 'guest_cli'
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+ build = false
+ subdir_done()
+endif
+
deps += ['power']
sources = files(
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
@@ -6,6 +6,13 @@
# To build this example as a standalone application with an already-installed
# 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']
endif
@@ -18,9 +25,6 @@ if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
deps += ['pmd_ixgbe']
endif
-deps += ['power']
-
-
sources = files(
'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
)
--
2.17.1
next reply other threads:[~2019-07-12 9:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 9:06 David Hunt [this message]
2019-07-12 9:22 ` Bruce Richardson
2019-07-12 9:28 ` Ferruh Yigit
2019-07-12 23:23 ` Stephen Hemminger
2019-07-15 8:51 ` Hunt, David
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190712090651.11824-1-david.hunt@intel.com \
--to=david.hunt@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).