mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-22 00:41:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

ld.so.cache: Fix order of extension libs

Browse Source 
We include the app extension ld.so.conf files before the app
and after that the runtime extension conf files.

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

Closes: #1076
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2017-10-04 13:07:58 +02:00
committed by Atomic Bot
parent aa28d9c7b4
commit eaa780ea63
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-run.c
View File

@@ -4935,9 +4935,10 @@ add_ld_so_conf (GPtrArray *argv_array,
GError **error)
{
const char *contents =
"include /run/flatpak/ld.so.conf.d/*.conf\n"
"include /run/flatpak/ld.so.conf.d/app-*.conf\n"
"include /app/etc/ld.so.conf\n"
"/app/lib\n";
"/app/lib\n"
"include /run/flatpak/ld.so.conf.d/runtime-*.conf\n";
return add_args_data (argv_array, fd_array,
contents, -1, "/etc/ld.so.conf", error);