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-Fix-DATADIRNAME-on-uclibc-Linux.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-Fix-DATADIRNAME-on-uclibc-Linux.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch deleted file mode 100644 index eb9dfdbcf9..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 9a5d4bf65b658d744d610ee27ecd2ae65b14b158 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 | ||
4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux | ||
5 | |||
6 | translation files are always installed under PREFIX/share/locale in uclibc | ||
7 | based systems therefore lets set DATADIRNAME to "share". | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Pending | ||
11 | --- | ||
12 | m4macros/glib-gettext.m4 | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 | ||
16 | index df6fbf0..47db864 100644 | ||
17 | --- a/m4macros/glib-gettext.m4 | ||
18 | +++ b/m4macros/glib-gettext.m4 | ||
19 | @@ -293,6 +293,10 @@ msgstr "" | ||
20 | CATOBJEXT=.mo | ||
21 | DATADIRNAME=share | ||
22 | ;; | ||
23 | + *-*-musl* | *-*-linux-uclibc*) | ||
24 | + CATOBJEXT=.gmo | ||
25 | + DATADIRNAME=share | ||
26 | + ;; | ||
27 | *) | ||
28 | CATOBJEXT=.mo | ||
29 | DATADIRNAME=lib | ||