summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch20
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch6
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch48
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch201
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch61
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb)6
6 files changed, 18 insertions, 324 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index 5747d61c19..639f9c8f61 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,4 +1,4 @@
1From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001 1From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 15 Nov 2018 15:10:05 +0100 3Date: Thu, 15 Nov 2018 15:10:05 +0100
4Subject: [PATCH] Port cross-compilation support to meson 4Subject: [PATCH] Port cross-compilation support to meson
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 3 files changed, 68 insertions(+), 18 deletions(-) 13 3 files changed, 68 insertions(+), 18 deletions(-)
14 14
15diff --git a/gir/meson.build b/gir/meson.build 15diff --git a/gir/meson.build b/gir/meson.build
16index 85ae575..327c134 100644 16index c312100..a028033 100644
17--- a/gir/meson.build 17--- a/gir/meson.build
18+++ b/gir/meson.build 18+++ b/gir/meson.build
19@@ -36,16 +36,29 @@ gir_files = [ 19@@ -41,16 +41,29 @@ gir_files = [
20 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') 20 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
21 install_data(gir_files, install_dir: girdir) 21 install_data(gir_files, install_dir: girdir)
22 22
@@ -56,7 +56,7 @@ index 85ae575..327c134 100644
56 56
57 dep_type = glib_dep.type_name() 57 dep_type = glib_dep.type_name()
58 if dep_type == 'internal' 58 if dep_type == 'internal'
59@@ -58,6 +71,12 @@ if dep_type == 'internal' 59@@ -63,6 +76,12 @@ if dep_type == 'internal'
60 '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] 60 '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
61 endif 61 endif
62 62
@@ -69,7 +69,7 @@ index 85ae575..327c134 100644
69 # Take a glob and print to newlines 69 # Take a glob and print to newlines
70 globber = ''' 70 globber = '''
71 from glob import glob 71 from glob import glob
72@@ -84,8 +103,8 @@ glib_command = scanner_command + [ 72@@ -89,8 +108,8 @@ glib_command = scanner_command + [
73 73
74 if dep_type == 'pkgconfig' 74 if dep_type == 'pkgconfig'
75 glib_command += ['--external-library', '--pkg=glib-2.0'] 75 glib_command += ['--external-library', '--pkg=glib-2.0']
@@ -80,8 +80,8 @@ index 85ae575..327c134 100644
80 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') 80 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
81 glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') 81 glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
82 glib_files += join_paths(glib_libincdir, 'glibconfig.h') 82 glib_files += join_paths(glib_libincdir, 'glibconfig.h')
83@@ -339,7 +358,7 @@ endforeach 83@@ -345,7 +364,7 @@ if giounix_dep.found()
84 if giounix_dep.found() 84 dep_type = giounix_dep.type_name()
85 if dep_type == 'pkgconfig' 85 if dep_type == 'pkgconfig'
86 gio_command += ['--pkg=gio-unix-2.0'] 86 gio_command += ['--pkg=gio-unix-2.0']
87- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') 87- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
@@ -89,7 +89,7 @@ index 85ae575..327c134 100644
89 # Get the installed gio-unix header list 89 # Get the installed gio-unix header list
90 ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) 90 ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
91 if ret.returncode() != 0 91 if ret.returncode() != 0
92@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', 92@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository',
93 ) 93 )
94 94
95 typelibs = [] 95 typelibs = []
@@ -119,10 +119,10 @@ index 85ae575..327c134 100644
119 install_dir: typelibdir, 119 install_dir: typelibdir,
120 ) 120 )
121diff --git a/meson.build b/meson.build 121diff --git a/meson.build b/meson.build
122index 95bbd2b..f7baefd 100644 122index a5e825f..a28490a 100644
123--- a/meson.build 123--- a/meson.build
124+++ b/meson.build 124+++ b/meson.build
125@@ -163,7 +163,9 @@ endif 125@@ -168,7 +168,9 @@ endif
126 subdir('girepository') 126 subdir('girepository')
127 subdir('tools') 127 subdir('tools')
128 subdir('giscanner') 128 subdir('giscanner')
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index a4f45a142d..a15401aeb2 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
1From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001 1From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001
2From: Sascha Silbe <x-yo17@se-silbe.de> 2From: Sascha Silbe <x-yo17@se-silbe.de>
3Date: Fri, 8 Jun 2018 13:55:10 +0200 3Date: Fri, 8 Jun 2018 13:55:10 +0200
4Subject: [PATCH] Relocate the repository directory for native builds 4Subject: [PATCH] Relocate the repository directory for native builds
@@ -62,10 +62,10 @@ index ca5dc2b..7a4d17f 100644
62 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); 62 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
63 63
64diff --git a/girepository/meson.build b/girepository/meson.build 64diff --git a/girepository/meson.build b/girepository/meson.build
65index 0261e1a..4cb646f 100644 65index 1d7aed6..5637fb5 100644
66--- a/girepository/meson.build 66--- a/girepository/meson.build
67+++ b/girepository/meson.build 67+++ b/girepository/meson.build
68@@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals', 68@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals',
69 ], 69 ],
70 c_args: gi_hidden_visibility_cflags + custom_c_args, 70 c_args: gi_hidden_visibility_cflags + custom_c_args,
71 include_directories : configinc, 71 include_directories : configinc,
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
deleted file mode 100644
index d1fdc068c0..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 23 Mar 2016 17:07:28 +0200
4Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
5 support
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 common.mk | 4 ----
12 giscanner/gdumpparser.py | 6 ------
13 2 files changed, 10 deletions(-)
14
15diff --git a/common.mk b/common.mk
16index 64fb02f..77e819d 100644
17--- a/common.mk
18+++ b/common.mk
19@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
20 --add-include-path=$(top_builddir) \
21 --add-include-path=$(top_builddir)/gir
22
23-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
24-# Normally will be undefined but can be set (e.g. to wine or qemu)
25-# when cross-compiling
26 INTROSPECTION_COMPILER = \
27 env PATH=".libs:$(PATH)" \
28- $(GI_CROSS_LAUNCHER) \
29 $(top_builddir)/g-ir-compiler$(EXEEXT)
30
31 INTROSPECTION_COMPILER_ARGS = \
32diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
33index 1730fee..26bab84 100644
34--- a/giscanner/gdumpparser.py
35+++ b/giscanner/gdumpparser.py
36@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection."""
37 out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
38
39 args = []
40-
41- # Prepend the launcher command and arguments, if defined
42- launcher = os.environ.get('GI_CROSS_LAUNCHER')
43- if launcher:
44- args.extend(launcher.split())
45-
46 args.extend(self._binary.args)
47 args.append('--introspect-dump=%s,%s' % (in_path, out_path))
48
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
deleted file mode 100644
index e4fffcf613..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
+++ /dev/null
@@ -1,201 +0,0 @@
1From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Oct 2015 18:29:21 +0300
4Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper
5 and introspection-data options
6
7With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner)
8that are already installed in the host system will be used for building the source tree.
9
10With the second option, g-ir-scanner will be instructed to use an executable
11wrapper to run binaries it's producing, and g-ir-compiler will be run
12through the same wrapper (host system's g-ir-compiler cannot be used because
13it's producing architecture-specific output).
14
15With the third option, giscanner will be instructed to use a special ldd
16command instead of system's ldd (which does not work when the binary to inspect
17is compiled for a different architecture).
18
19With the fourth option, it is possible to disable building of introspection data
20(.gir and .typelib files), which may be difficult or impossible in cross-compilation
21environments, because of lack of emulation (or native hardware) for the target architecture
22on which the target binaries can be run.
23
24These options are useful when cross-compiling for a different target architecture.
25
26Upstream-Status: Pending [review on oe-core list]
27Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
28
29---
30 Makefile.am | 2 ++
31 common.mk | 39 +++++++++++++++++++++++++++++++++++++++
32 configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++
33 tests/Makefile.am | 5 ++++-
34 4 files changed, 87 insertions(+), 1 deletion(-)
35
36diff --git a/Makefile.am b/Makefile.am
37index 952bf71..797a3bd 100644
38--- a/Makefile.am
39+++ b/Makefile.am
40@@ -21,7 +21,9 @@ include Makefile-cmph.am
41 include Makefile-girepository.am
42 include Makefile-giscanner.am
43 include Makefile-examples.am
44+if BUILD_INTROSPECTION_DATA
45 include Makefile-gir.am
46+endif
47 include Makefile-tools.am
48
49 ## Process this file with automake to produce Makefile.in
50diff --git a/common.mk b/common.mk
51index 77e819d..379ab53 100644
52--- a/common.mk
53+++ b/common.mk
54@@ -6,6 +6,15 @@
55 # module itself.
56 #
57
58+if USE_HOST_GI
59+INTROSPECTION_SCANNER = \
60+ env PATH="$(PATH)" \
61+ LPATH=.libs \
62+ CC="$(CC)" \
63+ PYTHONPATH=$(top_builddir):$(top_srcdir) \
64+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
65+ g-ir-scanner
66+else
67 INTROSPECTION_SCANNER = \
68 env PATH=".libs:$(PATH)" \
69 LPATH=.libs \
70@@ -14,9 +23,24 @@ INTROSPECTION_SCANNER = \
71 UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
72 UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
73 $(top_builddir)/g-ir-scanner
74+endif
75+
76+if USE_CROSS_WRAPPER
77+CROSS_WRAPPER_ARG = --use-binary-wrapper=$(GI_CROSS_WRAPPER)
78+else
79+CROSS_WRAPPER_ARG =
80+endif
81+
82+if USE_LDD_WRAPPER
83+LDD_WRAPPER_ARG = --use-ldd-wrapper=$(GI_LDD_WRAPPER)
84+else
85+LDD_WRAPPER_ARG =
86+endif
87
88 INTROSPECTION_SCANNER_ARGS = \
89 --verbose \
90+ $(CROSS_WRAPPER_ARG) \
91+ $(LDD_WRAPPER_ARG) \
92 -I$(top_srcdir) \
93 --add-include-path=$(srcdir) \
94 --add-include-path=$(top_srcdir)/gir \
95@@ -24,9 +48,15 @@ INTROSPECTION_SCANNER_ARGS = \
96 --add-include-path=$(top_builddir) \
97 --add-include-path=$(top_builddir)/gir
98
99+if USE_CROSS_WRAPPER
100+INTROSPECTION_COMPILER = \
101+ env PATH=".libs:$(PATH)" \
102+ $(GI_CROSS_WRAPPER) $(top_builddir)/.libs/g-ir-compiler$(EXEEXT)
103+else
104 INTROSPECTION_COMPILER = \
105 env PATH=".libs:$(PATH)" \
106 $(top_builddir)/g-ir-compiler$(EXEEXT)
107+endif
108
109 INTROSPECTION_COMPILER_ARGS = \
110 --includedir=$(srcdir) \
111@@ -35,6 +65,14 @@ INTROSPECTION_COMPILER_ARGS = \
112 --includedir=$(top_builddir) \
113 --includedir=$(top_builddir)/gir
114
115+if USE_HOST_GI
116+INTROSPECTION_DOCTOOL = \
117+ env PATH="$(PATH)" \
118+ LPATH=.libs \
119+ PYTHONPATH=$(top_builddir):$(top_srcdir) \
120+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
121+ g-ir-doc-tool
122+else
123 INTROSPECTION_DOCTOOL = \
124 env PATH=".libs:$(PATH)" \
125 LPATH=.libs \
126@@ -42,6 +80,7 @@ INTROSPECTION_DOCTOOL = \
127 UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
128 UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
129 $(top_builddir)/g-ir-doc-tool
130+endif
131
132 INTROSPECTION_DOCTOOL_ARGS = \
133 --add-include-path=$(srcdir) \
134diff --git a/configure.ac b/configure.ac
135index 885da70..cd8108b 100644
136--- a/configure.ac
137+++ b/configure.ac
138@@ -383,6 +383,48 @@ dnl
139 AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
140 AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
141
142+AC_ARG_ENABLE([host-gi],
143+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
144+[case "${enableval}" in
145+ yes) host_gi=true ;;
146+ no) host_gi=false ;;
147+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;;
148+esac],[host_gi=false])
149+AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue])
150+
151+AC_ARG_ENABLE([gi-cross-wrapper],
152+[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])],
153+[
154+GI_CROSS_WRAPPER="${enableval}"
155+use_wrapper=true
156+],[
157+GI_CROSS_WRAPPER=""
158+use_wrapper=false
159+])
160+AC_SUBST(GI_CROSS_WRAPPER)
161+AM_CONDITIONAL([USE_CROSS_WRAPPER], [test x$use_wrapper = xtrue])
162+
163+AC_ARG_ENABLE([gi-ldd-wrapper],
164+[AS_HELP_STRING([--enable-gi-ldd-wrapper=path],[Use a ldd wrapper instead of system's ldd command in giscanner (useful when cross-compiling)])],
165+[
166+GI_LDD_WRAPPER="${enableval}"
167+use_ldd_wrapper=true
168+],[
169+GI_LDD_WRAPPER=""
170+use_ldd_wrapper=false
171+])
172+AC_SUBST(GI_LDD_WRAPPER)
173+AM_CONDITIONAL([USE_LDD_WRAPPER], [test x$use_ldd_wrapper = xtrue])
174+
175+AC_ARG_ENABLE([introspection-data],
176+[AS_HELP_STRING([--enable-introspection-data],[Build introspection data (.gir and .typelib files) in addition to library and tools])],
177+[case "${enableval}" in
178+ yes) introspection_data=true ;;
179+ no) introspection_data=false ;;
180+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-introspection-data]) ;;
181+esac],[introspection_data=true])
182+AM_CONDITIONAL([BUILD_INTROSPECTION_DATA], [test x$introspection_data = xtrue])
183+
184 AC_CONFIG_FILES([
185 Makefile
186 tests/Makefile
187diff --git a/tests/Makefile.am b/tests/Makefile.am
188index 4bdb9c3..10b0f27 100644
189--- a/tests/Makefile.am
190+++ b/tests/Makefile.am
191@@ -1,6 +1,9 @@
192 include $(top_srcdir)/common.mk
193
194-SUBDIRS = . scanner repository offsets warn
195+SUBDIRS = . scanner repository warn
196+if BUILD_INTROSPECTION_DATA
197+SUBDIRS += offsets
198+endif
199
200 EXTRA_DIST=
201 BUILT_SOURCES=
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
index 74622680d6..26f8da6d41 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
@@ -1,4 +1,4 @@
1From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 Mon Sep 17 00:00:00 2001 1From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 8 Oct 2015 18:30:35 +0300 3Date: Thu, 8 Oct 2015 18:30:35 +0300
4Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR 4Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
@@ -11,64 +11,9 @@ Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 12
13--- 13---
14 Makefile-gir.am | 18 +++++++++--------- 14 m4/introspection.m4 | 8 ++++----
15 m4/introspection.m4 | 8 ++++---- 15 1 file changed, 4 insertions(+), 4 deletions(-)
16 2 files changed, 13 insertions(+), 13 deletions(-)
17 16
18diff --git a/Makefile-gir.am b/Makefile-gir.am
19index b59b0a6..24a50c2 100644
20--- a/Makefile-gir.am
21+++ b/Makefile-gir.am
22@@ -58,8 +58,8 @@ else
23 endif
24
25 # glib
26-GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
27-GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
28+GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
29+GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
30
31 GLIB_LIBRARY=glib-2.0
32
33@@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
34 gir/DBusGLib-1.0.typelib: GObject-2.0.gir
35
36 # gobject
37-GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
38-GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
39+GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
40+GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
41
42 GOBJECT_LIBRARY=gobject-2.0
43
44@@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \
45 BUILT_GIRSOURCES += GObject-2.0.gir
46
47 # gmodule
48-GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
49-GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
50+GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
51+GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
52
53 GMODULE_LIBRARY=gmodule-2.0
54
55@@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
56 BUILT_GIRSOURCES += GModule-2.0.gir
57
58 # gio
59-GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
60-GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
61+GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
62+GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
63
64 GIO_LIBRARY=gio-2.0
65
66 if HAVE_GIO_UNIX
67-GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
68+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
69 GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
70 GIO_UNIX_PACKAGES = gio-unix-2.0
71 else
72diff --git a/m4/introspection.m4 b/m4/introspection.m4 17diff --git a/m4/introspection.m4 b/m4/introspection.m4
73index d89c3d9..b562266 100644 18index d89c3d9..b562266 100644
74--- a/m4/introspection.m4 19--- a/m4/introspection.m4
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index f46053f443..c925115fb7 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
10 " 10 "
11 11
12SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ 12SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
13 file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
14 file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
15 file://0003-giscanner-add-use-binary-wrapper-option.patch \ 13 file://0003-giscanner-add-use-binary-wrapper-option.patch \
16 file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ 14 file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
17 file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ 15 file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
@@ -21,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
21 file://0001-meson.build-disable-tests-when-cross-compiling.patch \ 19 file://0001-meson.build-disable-tests-when-cross-compiling.patch \
22 " 20 "
23 21
24SRC_URI[md5sum] = "57c1c5dcf3d0a9aa73d06c2d5e6960d7" 22SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1"
25SRC_URI[sha256sum] = "ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c" 23SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2"
26 24
27SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" 25SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
28 26