1*4882a593SmuzhiyunFrom d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3*4882a593SmuzhiyunDate: Sat, 20 Nov 2021 23:57:33 +0100
4*4882a593SmuzhiyunSubject: [PATCH] gee/Makefile.am: include Makefile.introspection
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunInclude Makefile.introspection instead of using a custom rule which will
7*4882a593Smuzhiyunresult in the following build failure when cross-compiling on buildroot
8*4882a593Smuzhiyunbecause of missing --includedir:
9*4882a593Smuzhiyun
10*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la
11*4882a593SmuzhiyunCould not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir
12*4882a593Smuzhiyunerror parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0
13*4882a593Smuzhiyun
14*4882a593SmuzhiyunFixes:
15*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35
16*4882a593Smuzhiyun
17*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
18*4882a593Smuzhiyun[Upstream status:
19*4882a593Smuzhiyunhttps://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8]
20*4882a593Smuzhiyun---
21*4882a593Smuzhiyun gee/Makefile.am | 3 ++-
22*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-)
23*4882a593Smuzhiyun
24*4882a593Smuzhiyundiff --git a/gee/Makefile.am b/gee/Makefile.am
25*4882a593Smuzhiyunindex 5634bcb..e0d950e 100644
26*4882a593Smuzhiyun--- a/gee/Makefile.am
27*4882a593Smuzhiyun+++ b/gee/Makefile.am
28*4882a593Smuzhiyun@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \
29*4882a593Smuzhiyun 	-l $(libgee_dlname)
30*4882a593Smuzhiyun Gee-0.8.gir: libgee_0_8_la_vala.stamp
31*4882a593Smuzhiyun Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la
32*4882a593Smuzhiyun-	@INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
33*4882a593Smuzhiyun+
34*4882a593Smuzhiyun+-include $(INTROSPECTION_MAKEFILE)
35*4882a593Smuzhiyun endif
36*4882a593Smuzhiyun
37*4882a593Smuzhiyun MOSTLYCLEANFILES = \
38*4882a593Smuzhiyun--
39*4882a593Smuzhiyun2.33.0
40*4882a593Smuzhiyun
41