All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, ferruh.yigit@intel.com,
	thomas@monjalon.net, David Hunt <david.hunt@intel.com>,
	Maxime Coquelin <maxime.coquelin@redhat.com>,
	Chenbo Xia <chenbo.xia@intel.com>
Subject: [dpdk-dev] [PATCH] examples: skip example when missing dependencies
Date: Fri,  5 Nov 2021 14:30:55 +0100	[thread overview]
Message-ID: <20211105133055.13824-1-david.marchand@redhat.com> (raw)

Trying to disable the vhost library, meson will complain it can't build
the vhost* and vdpa examples when passing -Dexamples=all.

-Dexamples=all skips examples if the example itself announces it can't
be built (for external dependencies, internal dependencies and other
reasons).
Since examples/meson.build will evaluate the internal dependencies
in any case, let's move the check there and resolve the issue for
optional internal libraries.

Fixes: 0bf583222297 ("lib: allow disabling optional libraries")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 examples/distributor/meson.build              |  6 -----
 examples/kni/meson.build                      |  6 -----
 examples/l3fwd-power/meson.build              |  5 ----
 examples/meson.build                          | 24 ++++++++++++-------
 examples/vhost_crypto/meson.build             |  5 ----
 .../vm_power_manager/guest_cli/meson.build    |  5 ----
 examples/vm_power_manager/meson.build         |  5 ----
 7 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/examples/distributor/meson.build b/examples/distributor/meson.build
index 9df59923ce..ca1eca952e 100644
--- a/examples/distributor/meson.build
+++ b/examples/distributor/meson.build
@@ -6,12 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-# require the power library
-build = dpdk_conf.has('RTE_LIB_POWER')
-if not build
-    subdir_done()
-endif
-
 allow_experimental_apis = true
 deps += ['distributor', 'power']
 sources = files(
diff --git a/examples/kni/meson.build b/examples/kni/meson.build
index 1c0bf99a49..6bd4eb50e6 100644
--- a/examples/kni/meson.build
+++ b/examples/kni/meson.build
@@ -6,12 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-# this app can be built if-and-only-if KNI library is buildable
-build = dpdk_conf.has('RTE_LIB_KNI')
-if not build
-    subdir_done()
-endif
-
 deps += ['kni', 'bus_pci']
 sources = files(
         'main.c',
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index 0f69bb782c..624ef5e947 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -6,11 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-if not dpdk_conf.has('RTE_LIB_POWER')
-        build = false
-        subdir_done()
-endif
-
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash', 'metrics', 'telemetry']
 sources = files(
diff --git a/examples/meson.build b/examples/meson.build
index d50f09db12..35ec3471af 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -104,6 +104,22 @@ foreach example: examples
     deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
     subdir(example)
 
+    if build
+        dep_objs = ext_deps
+        foreach d:deps
+            if not build
+                break
+            endif
+            var_name = get_option('default_library') + '_rte_' + d
+            if not is_variable(var_name)
+                build = false
+                message('Missing dependency "@0@" for example "@1@"'.format(d, name))
+            else
+                dep_objs += [get_variable(var_name)]
+            endif
+        endforeach
+    endif
+
     if not build
         if not allow_skips
             error('Cannot build requested example "' + name + '"')
@@ -112,14 +128,6 @@ foreach example: examples
         continue
     endif
 
-    dep_objs = ext_deps
-    foreach d:deps
-        var_name = get_option('default_library') + '_rte_' + d
-        if not is_variable(var_name)
-            error('Missing dependency "@0@" for example "@1@"'.format(d, name))
-        endif
-        dep_objs += [get_variable(var_name)]
-    endforeach
     if allow_experimental_apis
         cflags += '-DALLOW_EXPERIMENTAL_API'
     endif
diff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build
index 720f42dd70..1c294c286f 100644
--- a/examples/vhost_crypto/meson.build
+++ b/examples/vhost_crypto/meson.build
@@ -6,11 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-build = dpdk_conf.has('RTE_LIB_VHOST')
-if not build
-    subdir_done()
-endif
-
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
 sources = files(
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index 666eef94ae..a69f809e3b 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -6,11 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-if not dpdk_conf.has('RTE_LIB_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 c15bad6609..b866d8fd54 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -6,11 +6,6 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-if not dpdk_conf.has('RTE_LIB_POWER')
-    build = false
-    subdir_done()
-endif
-
 deps += ['power']
 
 if dpdk_conf.has('RTE_NET_BNXT')
-- 
2.23.0


             reply	other threads:[~2021-11-05 13:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-05 13:30 David Marchand [this message]
2021-11-05 13:39 ` [dpdk-dev] [PATCH] examples: skip example when missing dependencies Bruce Richardson
2021-11-06  8:49   ` David Marchand
2021-11-06  8:53 ` [dpdk-dev] [PATCH v2] " David Marchand
2021-11-10 10:57   ` David Marchand

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=20211105133055.13824-1-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=bruce.richardson@intel.com \
    --cc=chenbo.xia@intel.com \
    --cc=david.hunt@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=thomas@monjalon.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.