From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 40259A00E6 for ; Fri, 12 Jul 2019 11:07:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA8521B9C6; Fri, 12 Jul 2019 11:07:01 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 16DE71B9AC for ; Fri, 12 Jul 2019 11:06:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2019 02:06:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,481,1557212400"; d="scan'208";a="365550798" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.88]) by fmsmga006.fm.intel.com with ESMTP; 12 Jul 2019 02:06:58 -0700 From: David Hunt To: dev@dpdk.org Cc: david.hunt@intel.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Date: Fri, 12 Jul 2019 10:06:51 +0100 Message-Id: <20190712090651.11824-1-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v1] examples/power: fix FreeBSD meson lib dependency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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