diff options
author | Bruce Richardson <bruce.richardson@intel.com> | 2019-05-02 17:51:53 +0100 |
---|---|---|
committer | Thomas Monjalon <thomas@monjalon.net> | 2019-05-02 23:07:04 +0200 |
commit | e09848337cac0f18833557034b181a48af517193 (patch) | |
tree | 4c2ef42e943ec2f99af6ed3b5e3a6b9a7d3a0fba /meson.build | |
parent | 2daf565f91b505c2db86aa19f9be2fb881dfd788 (diff) |
build: fix ninja install on FreeBSD
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: ed4d43d73e2b ("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>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/meson.build b/meson.build index a964865977..d1e8e5239a 100644 --- a/meson.build +++ b/meson.build @@ -63,13 +63,6 @@ configure_file(output: build_cfg, # them. 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.generate(name: meson.project_name(), filebase: 'lib' + meson.project_name().to_lower(), |