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 | 13 |
1 files changed, 8 insertions, 5 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 index 65d5b43f9b..0c8cbd731b 100644 --- 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 | |||
@@ -1,3 +1,8 @@ | |||
1 | From c8fa58dc2e9322727ba21eafbe9a69a5f68ffd35 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | ||
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | ||
5 | |||
1 | Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to | 6 | 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. | 7 | determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. |
3 | 8 | ||
@@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
8 | 13 | ||
9 | Port patch to 2.48 | 14 | Port patch to 2.48 |
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
16 | |||
11 | --- | 17 | --- |
12 | gio/giomodule.c | 12 +++++++++++- | 18 | gio/giomodule.c | 12 +++++++++++- |
13 | 1 file changed, 11 insertions(+), 1 deletion(-) | 19 | 1 file changed, 11 insertions(+), 1 deletion(-) |
14 | 20 | ||
15 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 21 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
16 | index da7c167..cc0bc7c 100644 | 22 | index 1ead84c..f744aa2 100644 |
17 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
18 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
19 | @@ -40,6 +40,8 @@ | 25 | @@ -40,6 +40,8 @@ |
@@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644 | |||
25 | #endif | 31 | #endif |
26 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
27 | 33 | ||
28 | @@ -1036,7 +1038,15 @@ get_gio_module_dir (void) | 34 | @@ -1083,7 +1085,15 @@ get_gio_module_dir (void) |
29 | #endif | 35 | #endif |
30 | g_free (install_dir); | 36 | g_free (install_dir); |
31 | #else | 37 | #else |
@@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644 | |||
42 | #endif | 48 | #endif |
43 | } | 49 | } |
44 | 50 | ||
45 | -- | ||
46 | 2.1.4 | ||
47 | |||