Skip to content

[staging-next] meson: do not update ldconfig cache #155067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veprbl merged 1 commit into from
Jan 15, 2022
Merged

[staging-next] meson: do not update ldconfig cache #155067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
# unsandboxed non-NixOS builds, see:
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
./boost-Do-not-add-system-paths-on-nix.patch

# Meson tries to update ld.so.cache which breaks when the target architecture
# differs from the build host's.
./do-not-update-ldconfig-cache.patch
];

setupHook = ./setup-hook.sh;
Expand Down
12 changes: 12 additions & 0 deletions pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index cb87faf5c..878ec4cd6 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -551,7 +551,6 @@ class Installer:
self.install_emptydir(d, dm, destdir, fullprefix)
self.install_data(d, dm, destdir, fullprefix)
self.restore_selinux_contexts(destdir)
- self.apply_ldconfig(dm, destdir)
self.run_install_script(d, destdir, fullprefix)
if not self.did_install_something:
self.log('Nothing to install.')