blob: 4cbcc29a5016f8bab07747fac520903b0948b16e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
This solves relocation problems with GIOModule for native builds of glib.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
Port patch to 2.48
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
gio/giomodule.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
index dc4d6d3..da46906 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -49,6 +49,8 @@
#include "gmemorymonitordbus.h"
#ifdef G_OS_WIN32
#include "gregistrysettingsbackend.h"
+#else
+#include <dlfcn.h>
#endif
#include <glib/gstdio.h>
@@ -1163,7 +1165,15 @@ get_gio_module_dir (void)
NULL);
g_free (install_dir);
#else
- module_dir = g_strdup (GIO_MODULE_DIR);
+ Dl_info info;
+
+ if (dladdr (g_io_module_new, &info)) {
+ char *libdir = g_path_get_dirname (info.dli_fname);
+ module_dir = g_build_filename (libdir, "gio", "modules", NULL);
+ g_free (libdir);
+ } else {
+ module_dir = g_strdup (GIO_MODULE_DIR);
+ }
#endif
}
|
