build: add optional arch-specific headers install path

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>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/config/meson.build b/config/meson.build
index b0f8511c054ce0806dbeaad78499134e5d08bb41..40c09196c03c677ce4c690812b7adde331aba5e4 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -70,4 +70,4 @@ dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id
 # values which have defaults which may be overridden
 dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
 
-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 80b5980c15655ec73d3335470104da8e101d5c59..5e9c026874a2cf444716ae7e19a59bc632c2837c 100644 (file)
--- 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 5cb7705f739d4882b3c28b40134401eefb76eed1..c1cbdfed24ec22470b3a3fc00e6b3b2d547f3222 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -72,7 +72,8 @@ subdir('app')
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
                configuration: dpdk_conf,
-               install_dir: get_option('includedir'))
+               install_dir: join_paths(get_option('includedir'),
+                               get_option('include_subdir_arch')))
 
 # for static builds, include the drivers as libs, and also any
 # other dependent libs that DPDK needs to link against
@@ -87,5 +88,6 @@ pkg.generate(name: meson.project_name(),
        version: meson.project_version(),
        libraries: dpdk_libraries,
        description: 'The Data Plane Development Kit (DPDK)',
+       subdirs: [get_option('include_subdir_arch'), '.'],
        extra_cflags: ['-include', 'rte_config.h', '-march=@0@'.format(machine)]
 )

diff --git a/meson_options.txt b/meson_options.txt
index 636226ce8ec9fb6b2689036a5db33a58232f2362..fb945db91e08969dc961c572835429847039de21 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,4 @@ option('allow_invalid_socket_id', type: 'boolean', value: false,
 option('enable_kmods', type: 'boolean', value: true, description: 'build kernel modules')
 option('kernel_dir', type: 'string', value: '', description: 'path to the kernel for building kernel modules')
 option('per_library_versions', type: 'boolean', value: true, description: 'true: each lib gets its own version number, false: DPDK version used for each lib')
+option('include_subdir_arch', type: 'string', value: '', description: 'subdirectory where to install arch-dependent headers')