summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-07 14:19:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-08 16:01:36 +0100
commitc7479bfd5fad4b9ba2e4299048a0c432200a5204 (patch)
treefadfe2895fe5c2d6573b0bdba46cbd632feab930 /meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
parent1e4a5fe4652bd957d822d0d3d6e7c8b7b4ff5b8e (diff)
downloadopenembedded-core-c7479bfd5fad4b9ba2e4299048a0c432200a5204.tar.gz
glib-2.0: udpate 2.58.3 -> 2.60.3
Drop autotools-specific parts from patches, as all autotools files have been removed upstream (meson is now the only option). Remove autotools-specific 0001-Revert-Use-absolute-paths-in-pkg-config-files.patch Remove backported fix-nl-abaltmon.patch Add a hunk to Enable-more-tests-while-cross-compiling.patch which comments out the part of the tests that hard-codes native ld for building. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch6
1 files changed, 3 insertions, 3 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 a4e0c9201f..2d698a67c8 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,4 +1,4 @@
-From 9d985803c50cfb99253c757934985f937da34822 Mon Sep 17 00:00:00 2001
+From 17ca85e329bf39c004b73a02e94b597dac41ddfe 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
@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 36c0cef..912e490 100644
+index b92162d..fce9933 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -40,6 +40,8 @@
@@ -31,7 +31,7 @@ index 36c0cef..912e490 100644
#endif
#include <glib/gstdio.h>
-@@ -1099,7 +1101,15 @@ get_gio_module_dir (void)
+@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
#endif
g_free (install_dir);
#else