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/0001-gio-tests-resources.c-comment-out-a-build-host-only-.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/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch deleted file mode 100644 index aee2986033..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 878e51f82100c698236fda0e069e14ea9249350c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 8 Jan 2020 18:22:46 +0100 | ||
4 | Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test | ||
5 | |||
6 | This test requires building resources in a way that is | ||
7 | not cross-compatible (hardcodes ld and objcopy). | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | gio/tests/resources.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c | ||
16 | index f567914..b21b616 100644 | ||
17 | --- a/gio/tests/resources.c | ||
18 | +++ b/gio/tests/resources.c | ||
19 | @@ -1068,7 +1068,7 @@ main (int argc, | ||
20 | g_test_add_func ("/resource/automatic", test_resource_automatic); | ||
21 | /* This only uses automatic resources too, so it tests the constructors and destructors */ | ||
22 | g_test_add_func ("/resource/module", test_resource_module); | ||
23 | - g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); | ||
24 | + /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */ | ||
25 | #endif | ||
26 | g_test_add_func ("/resource/uri/query-info", test_uri_query_info); | ||
27 | g_test_add_func ("/resource/uri/file", test_uri_file); | ||