mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-09 17:39:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

LD_LIBRARY_PATH: Fix order of extension libs

Browse Source 
We prepend the app extensions, so they are before /app/lib, but
we append the runtime extensions so they are after /app/lib.

This matches what is described in https://github.com/flatpak/flatpak/issues/1075

Closes: #1076
Approved by: alexlarsson

(cherry picked from commit f7a1c9fe7c)

Closes: #1115
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2017-10-04 13:34:55 +02:00
committed by Atomic Bot
parent ab36d9d4ad
commit 69323bb0be
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/flatpak-run.c
View File

@@ -2198,6 +2198,7 @@ flatpak_run_add_extension_args (GPtrArray *argv_array,
g_auto(GStrv) parts = NULL;
gboolean is_app;
GList *extensions, *l;
g_autoptr(GString) ld_library_path = g_string_new ("");
g_autoptr(GHashTable) mounted_tmpfs =
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
g_autoptr(GHashTable) created_symlink =
@@ -2246,15 +2247,9 @@ flatpak_run_add_extension_args (GPtrArray *argv_array,
if (ext->add_ld_path)
{
g_autofree char *ld_path = g_build_filename (full_directory, ext->add_ld_path, NULL);
const gchar *old_ld_path = g_environ_getenv (*envp_p, "LD_LIBRARY_PATH");
g_autofree char *new_ld_path = NULL;
if (old_ld_path != NULL)
new_ld_path = g_strconcat (old_ld_path, ":", ld_path, NULL);
else
new_ld_path = g_strdup (new_ld_path);
*envp_p = g_environ_setenv (*envp_p, "LD_LIBRARY_PATH", new_ld_path , TRUE);
if (ld_library_path->len != 0)
g_string_append (ld_library_path, ":");
g_string_append (ld_library_path, ld_path);
}
for (i = 0; ext->merge_dirs != NULL && ext->merge_dirs[i] != NULL; i++)
@@ -2286,6 +2281,27 @@ flatpak_run_add_extension_args (GPtrArray *argv_array,
g_list_free_full (extensions, (GDestroyNotify) flatpak_extension_free);
if (ld_library_path->len != 0)
{
const gchar *old_ld_path = g_environ_getenv (*envp_p, "LD_LIBRARY_PATH");
if (old_ld_path != NULL && *old_ld_path != 0)
{
if (is_app)
{
g_string_append (ld_library_path, ":");
g_string_append (ld_library_path, old_ld_path);
}
else
{
g_string_prepend (ld_library_path, ":");
g_string_prepend (ld_library_path, old_ld_path);
}
}
*envp_p = g_environ_setenv (*envp_p, "LD_LIBRARY_PATH", ld_library_path->str , TRUE);
}
return TRUE;
}