[v2,3/6] build: fix ninja install on FreeBSD
Checks
Commit Message
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")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
buildtools/symlink-drivers-solibs.sh | 7 ++++---
config/meson.build | 7 +++++++
meson.build | 7 -------
3 files changed, 11 insertions(+), 10 deletions(-)
Comments
On Fri, 2019-04-26 at 17:50 +0100, Bruce Richardson wrote:
> 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")
>
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
> buildtools/symlink-drivers-solibs.sh | 7 ++++---
> config/meson.build | 7 +++++++
> meson.build | 7 -------
> 3 files changed, 11 insertions(+), 10 deletions(-)
Acked-by: Luca Boccassi <bluca@debian.org>
@@ -7,6 +7,7 @@
# others, e.g. PCI device PMDs depending on the PCI bus driver.
# parameters to script are paths relative to install prefix:
-# 1. directory containing driver files e.g. lib64/dpdk/drivers
-# 2. directory for installed regular libs e.g. lib64
-ln -rsf ${DESTDIR}/${MESON_INSTALL_PREFIX}/$1/* ${DESTDIR}/${MESON_INSTALL_PREFIX}/$2
+# 1. directory for installed regular libs e.g. lib64
+# 2. subdirectory of libdir where the pmds are
+
+cd ${MESON_INSTALL_DESTDIR_PREFIX}/$1 && ln -sfv $2/librte_*.so* .
@@ -42,6 +42,13 @@ endif
driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
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
if meson.is_cross_build()
machine = host_machine.cpu()
@@ -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(),