diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-05-02 12:32:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-13 16:28:35 +0100 |
commit | 393ff343014ef819f7b74bc189e6d59b32e3f8be (patch) | |
tree | 4e2ccece39ec00a32199b80ec43d3a6e74d8d992 /meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |
parent | 521a3f727c983ddfb877c3dfe653f70ce912413e (diff) | |
download | poky-393ff343014ef819f7b74bc189e6d59b32e3f8be.tar.gz |
glib/gobject-introspection: update 2.78.4 -> 2.80.0, 1.78.1 -> 1.80.0
With these versions, which need to be updated in lockstep, upstream has
relocated glib introspection data from g-i tree to glib tree and made
its generation a part of the overall glib build. This creates a circular
dependency, where g-i tools are linked with glib, but glib needs the tools
to build its g-i data. (I don't know why the two source trees
couldn't be simply merged into one, or g-i data for glib couldn't be generated
inside g-i build against sysroot glib).
Upstream is suggesting building glib twice, first without building g-i data,
then building g-i and linking it with that version, then building
the final glib, and that's what is being done here (via the new
glib-initial recipe, which is sysroot-only, and is not pulled in
via indirect dependencies either).
Other glib changes:
0001-Do-not-write-bindir-into-pkg-config-files.patch restores
writing bindir variable into glib.pc file (meson only writes
it out if other variables depend on it, and this custom patch
removes that dependency).
0001-girepository-introspection-correctly-install-.gir-fi.patch
ensures correct installation of .gir into something else
than $datadir (useful in multilib).
Merge previous glib .bb into .inc, so that glib and glib-initial
recipes could be cleanly separated with no duplication.
Convert from gtk-doc to gi-docgen, and manpages from xmlto to
docutils.
(From OE-Core rev: 57c307536f67dcfb5d4a5488ca1e77a943ba1368)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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.patch | 44 |
1 files changed, 0 insertions, 44 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 3e79bbf679..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From f40e89b3852df37959606ee13b1a14ade81fa886 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 | |||
6 | Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to | ||
7 | determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. | ||
8 | |||
9 | This solves relocation problems with GIOModule for native builds of glib. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
13 | |||
14 | Port patch to 2.48 | ||
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
16 | --- | ||
17 | gio/giomodule.c | 7 ------- | ||
18 | 1 file changed, 7 deletions(-) | ||
19 | |||
20 | diff --git a/gio/giomodule.c b/gio/giomodule.c | ||
21 | index 17fabe6..8021208 100644 | ||
22 | --- a/gio/giomodule.c | ||
23 | +++ b/gio/giomodule.c | ||
24 | @@ -1271,11 +1271,6 @@ get_gio_module_dir (void) | ||
25 | g_free (install_dir); | ||
26 | #else | ||
27 | module_dir = g_strdup (GIO_MODULE_DIR); | ||
28 | -#ifdef __APPLE__ | ||
29 | -#include "TargetConditionals.h" | ||
30 | -/* Only auto-relocate on macOS, not watchOS etc; older macOS SDKs only define TARGET_OS_MAC */ | ||
31 | -#if (defined (TARGET_OS_OSX) && TARGET_OS_OSX) || \ | ||
32 | - (!defined (TARGET_OS_OSX) && defined (TARGET_OS_MAC) && TARGET_OS_MAC) | ||
33 | #include <dlfcn.h> | ||
34 | { | ||
35 | g_autofree gchar *path = NULL; | ||
36 | @@ -1294,8 +1289,6 @@ get_gio_module_dir (void) | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | -#endif | ||
41 | -#endif | ||
42 | #endif | ||
43 | } | ||
44 | |||