summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-05-02 12:32:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-13 16:28:35 +0100
commit393ff343014ef819f7b74bc189e6d59b32e3f8be (patch)
tree4e2ccece39ec00a32199b80ec43d3a6e74d8d992 /meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
parent521a3f727c983ddfb877c3dfe653f70ce912413e (diff)
downloadpoky-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/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
deleted file mode 100644
index ad69f7ec65..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 4933aef791857a5aac650b60af800778658b875b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
5
6We want to install this binary with the gio library, and debian
7renamer does not cope with library packages with files in ${bindir}
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Inappropriate [OE specific]
11---
12 gio/meson.build | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/gio/meson.build b/gio/meson.build
16index f9fdf6e..5f91586 100644
17--- a/gio/meson.build
18+++ b/gio/meson.build
19@@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
20 c_args : gio_c_args,
21 # intl.lib is not compatible with SAFESEH
22 link_args : noseh_link_args,
23+ install_dir: glib_libexecdir,
24 dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
25
26 glib_compile_schemas = executable('glib-compile-schemas',