build: change default driver installation directory
As part of the effort of consolidating the DPDK installation bits and pieces across distros, set the default directory of lib/ where PMDs get installed to dpdk/pmds-XX.YY. It's necessary to have a versioned subdirectory as multiple ABI revisions might be installed at the same time, so having a fixed name will cause trouble with the autoload feature. Small refactor with parsing and saving the major version to a variable, since it's now used in 3 different places. Signed-off-by: Luca Boccassi <bluca@debian.org> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Timothy Redaelli <tredaelli@redhat.com>
This commit is contained in:
parent
477f0d38b4
commit
085766aa67
@ -102,10 +102,8 @@ foreach class:driver_classes
|
||||
lib_version = '@0@.1'.format(version)
|
||||
so_version = '@0@'.format(version)
|
||||
else
|
||||
pver = meson.project_version().split('.')
|
||||
lib_version = '@0@.@1@'.format(pver.get(0),
|
||||
pver.get(1))
|
||||
so_version = lib_version
|
||||
lib_version = major_version
|
||||
so_version = major_version
|
||||
endif
|
||||
|
||||
# now build the static driver
|
||||
|
@ -93,10 +93,8 @@ foreach l:libraries
|
||||
lib_version = '@0@.1'.format(version)
|
||||
so_version = '@0@'.format(version)
|
||||
else
|
||||
prj_ver = meson.project_version().split('.')
|
||||
lib_version = '@0@.@1@'.format(
|
||||
prj_ver.get(0), prj_ver.get(1))
|
||||
so_version = lib_version
|
||||
lib_version = major_version
|
||||
so_version = major_version
|
||||
endif
|
||||
|
||||
# first build static lib
|
||||
|
@ -17,7 +17,13 @@ dpdk_drivers = []
|
||||
dpdk_extra_ldflags = []
|
||||
dpdk_app_link_libraries = []
|
||||
|
||||
driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers')
|
||||
# set the major version, which might be used by drivers and libraries
|
||||
# depending on the configuration options
|
||||
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)
|
||||
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
|
||||
|
||||
# configure the build, and make sure configs here and in config folder are
|
||||
|
Loading…
x
Reference in New Issue
Block a user