diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch deleted file mode 100644 index fe87482ae2..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a 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 c420260..a023745 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -47,6 +47,8 @@ - #include "gmemorymonitordbus.h" - #ifdef G_OS_WIN32 - #include "gregistrysettingsbackend.h" -+#else -+#include <dlfcn.h> - #endif - #include <glib/gstdio.h> - -@@ -1158,7 +1160,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 - } - |