diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-04-30 15:48:41 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:55:00 +0100 |
| commit | 772e6c566b1ba1d27895d78db1d082b3458f41fe (patch) | |
| tree | a32bafca52f88a2962154d43debdc344e2cc1d82 /meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |
| parent | ca6c82255fbf0ce359b6205c442e165219a3216e (diff) | |
| download | openembedded-core-772e6c566b1ba1d27895d78db1d082b3458f41fe.tar.gz | |
glib-2.0: update to 2.56.1
Remove upstreamed ptest-paths.patch
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +From c8fa58dc2e9322727ba21eafbe9a69a5f68ffd35 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. @@ -8,12 +13,13 @@ 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 da7c167..cc0bc7c 100644 +index 1ead84c..f744aa2 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -40,6 +40,8 @@ @@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644 #endif #include <glib/gstdio.h> -@@ -1036,7 +1038,15 @@ get_gio_module_dir (void) +@@ -1083,7 +1085,15 @@ get_gio_module_dir (void) #endif g_free (install_dir); #else @@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644 #endif } --- -2.1.4 - |