Skip to content
Snippets Groups Projects
Commit fe2a689f authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/denittis/t19989' into 'master'

Bind the host's ldconfig if we already use libc from the host

See merge request steam/pressure-vessel!36
parents 98f8dee1 6af64507
No related branches found
No related tags found
No related merge requests found
...@@ -1058,6 +1058,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1058,6 +1058,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
g_autoptr(GString) vulkan_path = g_string_new (""); g_autoptr(GString) vulkan_path = g_string_new ("");
gboolean any_architecture_works = FALSE; gboolean any_architecture_works = FALSE;
g_autofree gchar *localedef = NULL; g_autofree gchar *localedef = NULL;
g_autofree gchar *ldconfig = NULL;
g_autofree gchar *dir_on_host = NULL; g_autofree gchar *dir_on_host = NULL;
g_autoptr(SrtSystemInfo) system_info = srt_system_info_new (NULL); g_autoptr(SrtSystemInfo) system_info = srt_system_info_new (NULL);
g_autoptr(SrtObjectList) egl_icds = NULL; g_autoptr(SrtObjectList) egl_icds = NULL;
...@@ -1533,7 +1534,20 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1533,7 +1534,20 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
flatpak_bwrap_add_args (bwrap, flatpak_bwrap_add_args (bwrap,
"--symlink", target, "--symlink", target,
"/overrides/bin/localedef", "/overrides/bin/localedef",
NULL);
}
ldconfig = g_find_program_in_path ("ldconfig");
if (ldconfig == NULL)
{
g_warning ("Cannot find ldconfig in PATH");
}
else
{
flatpak_bwrap_add_args (bwrap,
"--ro-bind", ldconfig, "/sbin/ldconfig",
NULL); NULL);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment