From b63e5d479019f6d1873beb66591be556fca0f11a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 2 Oct 2018 17:20:46 +0100 Subject: [PATCH] build: add option to override drivers install directory Allow users and packagers to override the default dpdk/drivers subdirectory where the PMDs get installed under $lib. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Timothy Redaelli --- meson.build | 7 +++++-- meson_options.txt | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 356b4977db..d64eca545b 100644 --- a/meson.build +++ b/meson.build @@ -22,8 +22,11 @@ dpdk_app_link_libraries = [] pver = meson.project_version().split('.') major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) -driver_install_path = join_paths(get_option('libdir'), 'dpdk', - 'pmds-' + major_version) +pmd_subdir_opt = get_option('drivers_install_subdir') +if pmd_subdir_opt.contains('') + pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('')) +endif +driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are diff --git a/meson_options.txt b/meson_options.txt index d14bde892d..10b5416151 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') +option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', + description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_driver_mlx_glue', type: 'boolean', value: false, description: 'Enable glue library for Mellanox PMDs') option('enable_kmods', type: 'boolean', value: true, -- 2.20.1