summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.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/files/0010-Do-not-hardcode-python-path-into-various-tools.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/files/0010-Do-not-hardcode-python-path-into-various-tools.patch')
-rw-r--r--meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
new file mode 100644
index 0000000000..a51c186b00
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -0,0 +1,43 @@
1From e6784ba43af83e22556921786c8f15e4cd246298 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 3 Oct 2017 10:45:55 +0300
4Subject: [PATCH] Do not hardcode python path into various tools
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
10 gobject/glib-genmarshal.in | 2 +-
11 gobject/glib-mkenums.in | 2 +-
12 3 files changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
15index 67d3675..4e92a7a 100755
16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
18@@ -1,4 +1,4 @@
19-#!/usr/bin/env @PYTHON@
20+#!/usr/bin/env python3
21
22 # GDBus - GLib D-Bus Library
23 #
24diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
25index aa5af43..56e8e2e 100755
26--- a/gobject/glib-genmarshal.in
27+++ b/gobject/glib-genmarshal.in
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env @PYTHON@
30+#!/usr/bin/env python3
31
32 # pylint: disable=too-many-lines, missing-docstring, invalid-name
33
34diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
35index e10b910..4b619f8 100755
36--- a/gobject/glib-mkenums.in
37+++ b/gobject/glib-mkenums.in
38@@ -1,4 +1,4 @@
39-#!/usr/bin/env @PYTHON@
40+#!/usr/bin/env python3
41
42 # If the code below looks horrible and unpythonic, do not panic.
43 #