On Fri, Sep 15, 2017 at 06:36:11PM +0100, luca.bocca...@gmail.com wrote:
> From: Luca Boccassi <bl...@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 <bl...@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.richard...@intel.com>
