examples/power: fix FreeBSD meson lib dependency
PATCH 1/1 examples/power: fix FreeBSD meson lib dependency
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
--- 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(-)
examples/l3fwd-power/meson.build +4 -2
@@ -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(
examples/vm_power_manager/guest_cli/meson.build +5 -0
@@ -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(
examples/vm_power_manager/meson.build +7 -3
@@ -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' )
Signature · 1 line
2.17.1
Quoted 7 lines · David Hunt
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
Quoted 9 lines
Fixes e0130788576f ("examples/power: support meson/ninja build")Fixes 89f0711f9ddf ("examples: build some samples with meson")Signed-off-by David Hunt <[email protected]>--- 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(-)
Looks ok to me.
Ferruh Yigit
AppliedQuoted 18 lines · Bruce Richardson
Quoted 7 lines · David Hunt
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_cliQuoted 9 lines
Fixes e0130788576f ("examples/power: support meson/ninja build")Fixes 89f0711f9ddf ("examples: build some samples with meson")Signed-off-by David Hunt <[email protected]>--- 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(-)
Quoted 3 lines
Looks ok to me.
Acked-by Bruce Richardson <[email protected]>
Applied, thanks.
(Applied quickly because it was causing failure in our CI for each patch.)
Quoted 10 lines · On Fri, 12 Jul 2019 10:06:51 +0100 David Hunt <[email protected]> wrote:
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_cliFixes e0130788576f ("examples/power: support meson/ninja build")Fixes 89f0711f9ddf ("examples: build some samples with meson")Signed-off-by David Hunt <[email protected]>
Still seeing failures in build today.
My patches (not related) today failed intel-compilation...
*Meson Build Failed #1:
OS: FreeBSD12-64 Target:build-gcc-static
Has header "linux/virtio_scsi.h" : NO
Message: Skipping example "vhost_scsi" Library virt found: YES
Dependency jansson found: YES (cached)
examples/meson.build:88:4: ERROR: Problem encountered: Missing dependency "power" for example "vm_power_manager"
A full log can be found at /tmp/FreeBSD12-64_K19.02_GCC7.3.0/x86_64-native-bsdapp-gcc/f76f15ed805042438074e510f781c48d/dpdk/build-gcc-static/meson-logs/meson-log.txt ninja -C build-gcc-static
ninja: Entering directory `build-gcc-static'
ninja: error: loading 'build.ninja': No such file or directory
--
Has header "linux/virtio_scsi.h" : NO
Message: Skipping example "vhost_scsi"
Library virt found: YES
Dependency jansson found: YES (cached)
examples/meson.build:88:4: ERROR: Problem encountered: Missing dependency "power" for example "vm_power_manager"
A full log can be found at /tmp/FreeBSD12-64_K19.02_GCC7.3.0/x86_64-native-bsdapp-gcc/f76f15ed805042438074e510f781c48d/dpdk/build-gcc-shared/meson-logs/meson-log.txt ninja -C build-gcc-shared
ninja: Entering directory `build-gcc-shared'
ninja: error: loading 'build.ninja': No such file or directory
Quoted 10 lines · Stephen Hemminger
Quoted 7 lines · On Fri, 12 Jul 2019 10:06:51 +0100 David Hunt <[email protected]> wrote:
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
Quoted 6 lines
Quoted 3 lines
Fixes e0130788576f ("examples/power: support meson/ninja build")Fixes 89f0711f9ddf ("examples: build some samples with meson")Signed-off-by David Hunt <[email protected]>Still seeing failures in build today.
My patches (not related) today failed intel-compilation...
Hi Stephen,
Are you still seeing the errors today? The emails I'm receiving from the Intel build since the patch was applied are all showing success.
Rgds,
Dave.