From eaa780ea632f7cda5ba1f95dccbd89eeafba8a88 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 4 Oct 2017 13:07:58 +0200
Subject: [PATCH] ld.so.cache: Fix order of extension libs

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
---
 common/flatpak-run.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 8a8bf87b..56588a9c 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -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);