diff options
| author | Daniele Nicolodi <daniele@grinta.net> | 2025-07-20 16:56:49 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-07-22 13:23:16 -0700 |
| commit | c07eb44c2b54025a98162e0ccd4c70c0f9b2d244 (patch) | |
| tree | 5f9336a782c288491b4be571fc0b6e192fc717dc /mesonbuild | |
| parent | 3114bc65885a7499f5a255e76875fa88010e8589 (diff) | |
| download | meson-c07eb44c2b54025a98162e0ccd4c70c0f9b2d244.tar.gz | |
mintro: Record rpath_dirs_to_remove in install_plan
This is required by meson-python to fix RPATH entries when building a wheel.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mintro.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 57fa286b7..e19e528a3 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -125,14 +125,15 @@ def list_installed(installdata: backends.InstallData) -> T.Dict[str, str]: res[basename] = os.path.join(installdata.prefix, s.install_path, basename) return res -def list_install_plan(installdata: backends.InstallData) -> T.Dict[str, T.Dict[str, T.Dict[str, T.Optional[str]]]]: - plan: T.Dict[str, T.Dict[str, T.Dict[str, T.Optional[str]]]] = { +def list_install_plan(installdata: backends.InstallData) -> T.Dict[str, T.Dict[str, T.Dict[str, T.Union[str, T.List[str], None]]]]: + plan: T.Dict[str, T.Dict[str, T.Dict[str, T.Union[str, T.List[str], None]]]] = { 'targets': { Path(installdata.build_dir, target.fname).as_posix(): { 'destination': target.out_name, 'tag': target.tag or None, 'subproject': target.subproject or None, - 'install_rpath': target.install_rpath or None + 'install_rpath': target.install_rpath or None, + 'build_rpaths': sorted(x.decode('utf8') for x in target.rpath_dirs_to_remove), } for target in installdata.targets }, |
