From 99d809b59d30d17d3ad8826209f56b7f2a0370d3 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 28 Nov 2021 11:32:10 -0500 Subject: fix BSD ldconfig handling (#9631) For libraries installed to libdir, it's not expected to have rpath hooked up. But for non-default libdirs, the path might not get searched by default. `ldconfig -m ` is convenient here, as it will programmatically add a new directory to search for shared libraries, so the resulting installed programs work out of the box. Include the dragonfly BSD platform name, which doesn't match the 'bsd' catch-all pattern. --- mesonbuild/backend/backends.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 769ee6c..c9cf6fd 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -107,7 +107,7 @@ class CleanTrees: self.trees = trees class InstallData: - def __init__(self, source_dir: str, build_dir: str, prefix: str, + def __init__(self, source_dir: str, build_dir: str, prefix: str, libdir: str, strip_bin: T.List[str], install_umask: T.Union[str, int], mesonintrospect: T.List[str], version: str): # TODO: in python 3.8 or with typing_Extensions install_umask could be: @@ -115,6 +115,7 @@ class InstallData: self.source_dir = source_dir self.build_dir = build_dir self.prefix = prefix + self.libdir = libdir self.strip_bin = strip_bin self.install_umask = install_umask self.targets: T.List[TargetInstallData] = [] @@ -1485,6 +1486,7 @@ class Backend: d = InstallData(self.environment.get_source_dir(), self.environment.get_build_dir(), self.environment.get_prefix(), + self.environment.get_libdir(), strip_bin, umask, self.environment.get_build_command() + ['introspect'], -- cgit v1.1