From: Bruce Richardson <bruce.richardson@intel.com>
To: Luca Boccassi <bluca@debian.org>
Cc: dev@dpdk.org, tredaelli@redhat.com,
christian.ehrhardt@canonical.com, mvarlese@suse.de
Subject: Re: [PATCH v3 2/2] build: add drivers_install_subdir meson option
Date: Tue, 2 Oct 2018 16:58:57 +0100 [thread overview]
Message-ID: <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com> (raw)
In-Reply-To: <20181002152556.17041-2-bluca@debian.org>
On Tue, Oct 02, 2018 at 04:25:56PM +0100, Luca Boccassi wrote:
> Allow users and packagers to override the default dpdk/drivers
> subdirectory where the PMDs get installed under $lib.
>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
> v3: changed default value to <VERSION> and use string.contains rather
> than exact equivalence
>
> meson.build | 10 ++++++++--
> meson_options.txt | 2 ++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 4bd04b9de3..2e3cbac587 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -20,8 +20,14 @@ dpdk_extra_ldflags = []
> pver = meson.project_version().split('.')
> major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
>
> -driver_install_path = join_paths(get_option('libdir'), 'dpdk',
> - 'pmds-' + major_version)
> +pmd_subdir_opt = get_option('drivers_install_subdir')
> +if pmd_subdir_opt.contains('<VERSION>')
> + driver_install_path = join_paths(get_option('libdir'),
> + 'dpdk', 'pmds-' + major_version)
> +else
> + driver_install_path = join_paths(get_option('libdir'),
> + pmd_subdir_opt)
> +endif
> eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
>
The diff (to your patch) below demonstrates more of what I had in mind :-)
Basically do a replace of '<VERSION>' with the version number, leaving the
remaining string unchanged.
/Bruce
diff --git a/meson.build b/meson.build
index 2e3cbac58..11697861c 100644
--- a/meson.build
+++ b/meson.build
@@ -22,12 +22,9 @@ major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
pmd_subdir_opt = get_option('drivers_install_subdir')
if pmd_subdir_opt.contains('<VERSION>')
- driver_install_path = join_paths(get_option('libdir'),
- 'dpdk', 'pmds-' + major_version)
-else
- driver_install_path = join_paths(get_option('libdir'),
- pmd_subdir_opt)
+ pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
endif
+driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# configure the build, and make sure configs here and in config folder are
next prev parent reply other threads:[~2018-10-02 16:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-28 17:58 [PATCH] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-01 9:17 ` Bruce Richardson
2018-10-01 9:25 ` Bruce Richardson
2018-10-01 9:46 ` Luca Boccassi
2018-10-01 10:01 ` Bruce Richardson
2018-10-01 10:42 ` Timothy Redaelli
2018-10-01 11:06 ` Bruce Richardson
2018-10-01 11:24 ` Luca Boccassi
2018-10-02 11:02 ` Marco Varlese
2018-10-02 12:23 ` Bruce Richardson
2018-10-02 13:07 ` Luca Boccassi
2018-10-02 13:06 ` [PATCH v2 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Luca Boccassi
2018-10-02 13:06 ` [PATCH v2 2/2] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-02 14:28 ` Bruce Richardson
2018-10-02 14:59 ` Luca Boccassi
2018-10-02 15:19 ` Bruce Richardson
2018-10-02 15:26 ` Luca Boccassi
2018-10-02 15:25 ` [PATCH v3 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Luca Boccassi
2018-10-02 15:25 ` [PATCH v3 2/2] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-02 15:58 ` Bruce Richardson [this message]
2018-10-02 16:21 ` Luca Boccassi
2018-10-02 16:20 ` [PATCH v4 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Luca Boccassi
2018-10-02 16:20 ` [PATCH v4 2/2] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-02 16:30 ` Bruce Richardson
2018-10-05 16:00 ` Timothy Redaelli
2018-10-02 16:28 ` [PATCH v4 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Bruce Richardson
2018-10-05 16:00 ` Timothy Redaelli
2018-10-27 21:19 ` Thomas Monjalon
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=20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=mvarlese@suse.de \
--cc=tredaelli@redhat.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 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.