From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, Bruce Richardson <bruce.richardson@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v3 1/3] examples: fix install of sample apps if setting not provided
Date: Fri, 17 May 2019 13:02:29 +0100 [thread overview]
Message-ID: <20190517120231.15898-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190517120231.15898-1-bruce.richardson@intel.com>
While the examples were being installed into the appropriate install path
when processing the examples/meson.build file, that file was only processed
if the "examples" meson parameter was non-empty. Since we now do more than
just build the examples, we need to unconditionally process the file.
Fixes: 2daf565f91b5 ("examples: install as part of ninja install")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
examples/meson.build | 4 ++++
meson.build | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/examples/meson.build b/examples/meson.build
index 1a6134f12..1995f4dcb 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -19,6 +19,10 @@ foreach ex:all_examples
exclude_files: 'meson.build')
endforeach
+if get_option('examples') == ''
+ subdir_done()
+endif
+
if get_option('examples').to_lower() == 'all'
examples = all_examples
allow_skips = true # don't flag an error if we can't build an app
diff --git a/meson.build b/meson.build
index 46f9c5683..9cad43481 100644
--- a/meson.build
+++ b/meson.build
@@ -42,10 +42,9 @@ subdir('app')
# build docs
subdir('doc')
-# build any examples explicitly requested - useful for developers
-if get_option('examples') != ''
- subdir('examples')
-endif
+# build any examples explicitly requested - useful for developers - and
+# install any example code into the appropriate install path
+subdir('examples')
# build kernel modules if enabled
if get_option('enable_kmods')
--
2.21.0
next prev parent reply other threads:[~2019-05-17 12:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190503133537.58712-1-bruce.richardson@intel.com>
[not found] ` <20190517114613.7027-1-bruce.richardson@intel.com>
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 " Bruce Richardson
2019-05-17 11:54 ` Bruce Richardson
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 2/3] examples: remove auto-generation of examples list Bruce Richardson
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 3/3] examples: fix make clean when using pkg-config for building Bruce Richardson
[not found] ` <20190517120231.15898-1-bruce.richardson@intel.com>
2019-05-17 12:02 ` Bruce Richardson [this message]
2019-05-17 12:02 ` [dpdk-stable] [PATCH v3 2/3] examples: remove auto-generation of examples list Bruce Richardson
2019-05-17 12:02 ` [dpdk-stable] [PATCH v3 3/3] examples: fix make clean when using pkg-config for building Bruce Richardson
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=20190517120231.15898-2-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/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).