1*4882a593SmuzhiyunFrom ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 12 Nov 2021 18:01:05 +0100 4*4882a593SmuzhiyunSubject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAdd girdir to gio-2.0.pc and glib-2.0.pc to fix the following build 7*4882a593Smuzhiyunfailure with atk or libnice: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler atk/Atk-1.0.gir --output atk/Atk-1.0.typelib --includedir=/usr/share/gir-1.0 10*4882a593SmuzhiyunCould not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunFixes: 13*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae 14*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun gio/meson.build | 1 + 19*4882a593Smuzhiyun glib/meson.build | 1 + 20*4882a593Smuzhiyun 2 files changed, 2 insertions(+) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/gio/meson.build b/gio/meson.build 23*4882a593Smuzhiyunindex 29473d26b..112d4ada9 100644 24*4882a593Smuzhiyun--- a/gio/meson.build 25*4882a593Smuzhiyun+++ b/gio/meson.build 26*4882a593Smuzhiyun@@ -831,6 +831,7 @@ pkg.generate(libgio, 27*4882a593Smuzhiyun variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 28*4882a593Smuzhiyun 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 29*4882a593Smuzhiyun 'bindir=' + join_paths('${prefix}', get_option('bindir')), 30*4882a593Smuzhiyun+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), 31*4882a593Smuzhiyun 'giomoduledir=' + pkgconfig_giomodulesdir, 32*4882a593Smuzhiyun 'gio=' + join_paths('${bindir}', 'gio'), 33*4882a593Smuzhiyun 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), 34*4882a593Smuzhiyundiff --git a/glib/meson.build b/glib/meson.build 35*4882a593Smuzhiyunindex f78f32969..6c5486699 100644 36*4882a593Smuzhiyun--- a/glib/meson.build 37*4882a593Smuzhiyun+++ b/glib/meson.build 38*4882a593Smuzhiyun@@ -377,6 +377,7 @@ pkg.generate(libglib, 39*4882a593Smuzhiyun subdirs : ['glib-2.0'], 40*4882a593Smuzhiyun extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, 41*4882a593Smuzhiyun variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), 42*4882a593Smuzhiyun+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), 43*4882a593Smuzhiyun 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), 44*4882a593Smuzhiyun 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 45*4882a593Smuzhiyun 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], 46*4882a593Smuzhiyun-- 47*4882a593Smuzhiyun2.33.0 48*4882a593Smuzhiyun 49