d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: add optional arch-specific headers install path

Browse Source 
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>
This commit is contained in:
Luca Boccassi 2017-09-15 18:36:11 +01:00 committed by Bruce Richardson
parent 52164553cd
commit d7939c5f87
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/meson.build
View File

@ -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'))

3
lib/librte_eal/common/include/arch/x86/meson.build
View File

@ -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'))

4
meson.build
View File

@ -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)]
)

1
meson_options.txt
View File

@ -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')