Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to |
| 2 | determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. |
| 3 | |
| 4 | This solves relocation problems with GIOModule for native builds of glib. |
| 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 8 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 9 | Port patch to 2.48 |
| 10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 11 | --- |
| 12 | gio/giomodule.c | 12 +++++++++++- |
| 13 | 1 file changed, 11 insertions(+), 1 deletion(-) |
| 14 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 15 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 16 | index da7c167..cc0bc7c 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 17 | --- a/gio/giomodule.c |
| 18 | +++ b/gio/giomodule.c |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 19 | @@ -40,6 +40,8 @@ |
| 20 | #include "gnetworkmonitor.h" |
| 21 | #ifdef G_OS_WIN32 |
| 22 | #include "gregistrysettingsbackend.h" |
| 23 | +#else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 24 | +#include <dlfcn.h> |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 25 | #endif |
| 26 | #include <glib/gstdio.h> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 28 | @@ -1036,7 +1038,15 @@ get_gio_module_dir (void) |
| 29 | #endif |
| 30 | g_free (install_dir); |
| 31 | #else |
| 32 | - module_dir = g_strdup (GIO_MODULE_DIR); |
| 33 | + Dl_info info; |
| 34 | + |
| 35 | + if (dladdr (g_io_module_new, &info)) { |
| 36 | + char *libdir = g_path_get_dirname (info.dli_fname); |
| 37 | + module_dir = g_build_filename (libdir, "gio", "modules", NULL); |
| 38 | + g_free (libdir); |
| 39 | + } else { |
| 40 | + module_dir = g_strdup (GIO_MODULE_DIR); |
| 41 | + } |
| 42 | #endif |
| 43 | } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 44 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 45 | -- |
| 46 | 2.1.4 |
| 47 | |