From: Bruce Richardson <bruce.richardson@intel.com>
To: luca.boccassi@gmail.com
Cc: dev@dpdk.org, Luca Boccassi <bluca@debian.org>
Subject: Re: [dpdk-dev] [PATCH 2/3] build: add optional arch-specific headers install path
Date: Mon, 18 Sep 2017 12:27:18 +0100 [thread overview]
Message-ID: <20170918112718.GB10264@bricha3-MOBL3.ger.corp.intel.com> (raw)
In-Reply-To: <20170915173612.13636-3-luca.boccassi@gmail.com>
On Fri, Sep 15, 2017 at 06:36:11PM +0100, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
>
> A subset of the dpdk headers are arch-dependent, but have common names
> and thus cause a clash in a multiarch installation.
> For example, rte_config.h is different for each target.
>
> Add a "include_subdir_arch" option to allow a user to specify a
> subdirectory for arch independent headers to fix multiarch support.
>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
> config/meson.build | 2 +-
> lib/librte_eal/common/include/arch/x86/meson.build | 3 ++-
> meson.build | 3 ++-
> meson_options.txt | 1 +
> 4 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/config/meson.build b/config/meson.build
> index b57a7e64b..db68a08d4 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -69,4 +69,4 @@ dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
> dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
> dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
>
> -install_headers('rte_config.h')
> +install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
> diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build
> index 80b5980c1..5e9c02687 100644
> --- a/lib/librte_eal/common/include/arch/x86/meson.build
> +++ b/lib/librte_eal/common/include/arch/x86/meson.build
> @@ -45,4 +45,5 @@ install_headers(
> 'rte_rtm.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> - 'rte_vect.h')
> + 'rte_vect.h',
> + subdir: get_option('include_subdir_arch'))
> diff --git a/meson.build b/meson.build
> index f41fb4120..134158dae 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -70,7 +70,7 @@ subdir('app')
> build_cfg = 'rte_build_config.h'
> configure_file(output: build_cfg,
> configuration: dpdk_conf,
> - install_dir: get_option('includedir'))
> + install_dir: get_option('includedir') + '/' + get_option('include_subdir_arch'))
Minor nit: use "join_paths()" function. Will fix on apply.
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
next prev parent reply other threads:[~2017-09-18 11:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 17:36 [dpdk-dev] [PATCH 0/3] meson: compatibility with Debian/Ubuntu luca.boccassi
2017-09-15 17:36 ` [dpdk-dev] [PATCH 1/3] build: rename pkgconfig to libdpdk.pc luca.boccassi
2017-09-18 11:09 ` Bruce Richardson
2017-09-18 11:52 ` Luca Boccassi
2017-09-15 17:36 ` [dpdk-dev] [PATCH 2/3] build: add optional arch-specific headers install path luca.boccassi
2017-09-18 11:27 ` Bruce Richardson [this message]
2017-09-15 17:36 ` [dpdk-dev] [PATCH 3/3] build: don't hard-code generic/exec-env " luca.boccassi
2017-09-18 11:28 ` Bruce Richardson
2017-09-18 11:29 ` [dpdk-dev] [PATCH 0/3] meson: compatibility with Debian/Ubuntu 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=20170918112718.GB10264@bricha3-MOBL3.ger.corp.intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=luca.boccassi@gmail.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 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).