summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2017-09-15 18:36:11 +0100
committerBruce Richardson <bruce.richardson@intel.com>2018-01-30 21:51:45 +0100
commitd7939c5f877e017c8b3c3f3bfb85f7583cd3ac5b (patch)
tree300a28599c5add5f20803d8df43a455d11c05f0f /meson.build
parent52164553cd4a397941cf94eb4a4d640544c6e7f1 (diff)
downloaddpdk-d7939c5f877e017c8b3c3f3bfb85f7583cd3ac5b.zip
dpdk-d7939c5f877e017c8b3c3f3bfb85f7583cd3ac5b.tar.gz
dpdk-d7939c5f877e017c8b3c3f3bfb85f7583cd3ac5b.tar.xz
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>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 5cb7705..c1cbdfe 100644
--- 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)]
)