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

build: fix ninja install on FreeBSD

Browse Source 
The post-install script to symlink the PMDs from their own PMD directory to
the regular lib directory (so they would be found by ld at runtime) was
using the "-r" flag to ln to create relative symlinks. This flag is
unsupported by ln on FreeBSD causing the ninja install step to fail.

Reworking the script to take the relative driver path as parameter removes
the need for ln to calculate the relative path ensuring compatibility with
FreeBSD.

As part of the fix, we move the registration of the install script to the
config/meson.build file, from the top level one. This improves readability
as the script takes as parameters the variables set in that file.

Fixes: ed4d43d73e ("build: symlink drivers to library directory")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Bruce Richardson 2019-05-02 17:51:53 +01:00 committed by Thomas Monjalon
parent 2daf565f91
commit e09848337c
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildtools/symlink-drivers-solibs.sh
View File

@ -7,6 +7,7 @@
# others, e.g. PCI device PMDs depending on the PCI bus driver. # others, e.g. PCI device PMDs depending on the PCI bus driver.
# parameters to script are paths relative to install prefix: # parameters to script are paths relative to install prefix:
# 1. directory containing driver files e.g. lib64/dpdk/drivers # 1. directory for installed regular libs e.g. lib64
# 2. directory for installed regular libs e.g. lib64 # 2. subdirectory of libdir where the pmds are
ln -rsf ${DESTDIR}/${MESON_INSTALL_PREFIX}/$1/* ${DESTDIR}/${MESON_INSTALL_PREFIX}/$2
cd ${MESON_INSTALL_DESTDIR_PREFIX}/$1 && ln -sfv $2/librte_*.so* .

7
config/meson.build
View File

@ -42,6 +42,13 @@ endif
driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# driver .so files often depend upon the bus drivers for their connect bus,
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
get_option('libdir'),
pmd_subdir_opt)
# set the machine type and cflags for it # set the machine type and cflags for it
if meson.is_cross_build() if meson.is_cross_build()
machine = host_machine.cpu() machine = host_machine.cpu()

7
meson.build
View File

@ -63,13 +63,6 @@ configure_file(output: build_cfg,
# them. # them.
dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
# driver .so files often depend upon the bus drivers for their connect bus,
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
meson.add_install_script('buildtools/symlink-drivers-solibs.sh',
driver_install_path,
get_option('libdir'))
pkg = import('pkgconfig') pkg = import('pkgconfig')
pkg.generate(name: meson.project_name(), pkg.generate(name: meson.project_name(),
filebase: 'lib' + meson.project_name().to_lower(), filebase: 'lib' + meson.project_name().to_lower(),