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/skip-timeout.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/skip-timeout.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch b/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch deleted file mode 100644 index cd5ac287c3..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From bb11d1a4ae77d93ec0743e54077cf0f990243fa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Thu, 28 Mar 2024 16:27:09 +0000 | ||
4 | Subject: [PATCH] Skip /timeout/rounding test | ||
5 | |||
6 | This test is sensitive to load because it expects certain timeout operations | ||
7 | to succeed in specific time periods. Whilst these timeouts are fairly large, | ||
8 | they're still exceeded inside a qemu on a loaded system. | ||
9 | |||
10 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=14464 | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-specific] | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | --- | ||
15 | glib/tests/timeout.c | 1 - | ||
16 | 1 file changed, 1 deletion(-) | ||
17 | |||
18 | diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c | ||
19 | index 1ae3f3a34..85a715b0f 100644 | ||
20 | --- a/glib/tests/timeout.c | ||
21 | +++ b/glib/tests/timeout.c | ||
22 | @@ -214,7 +214,6 @@ main (int argc, char *argv[]) | ||
23 | g_test_add_func ("/timeout/seconds-once", test_seconds_once); | ||
24 | g_test_add_func ("/timeout/weeks-overflow", test_weeks_overflow); | ||
25 | g_test_add_func ("/timeout/far-future-ready-time", test_far_future_ready_time); | ||
26 | - g_test_add_func ("/timeout/rounding", test_rounding); | ||
27 | |||
28 | return g_test_run (); | ||
29 | } | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||