mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-25 11:30:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libglib2: add girdir to glib-2.0.pc

Browse Source 
Add girdir to glib-2.0.pc to fix the following build failure with atk,
gcr or harfbuzz:

/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
Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir

This build failure could also be fixed by removing our update of girdir
in gobject-introspection.mk but this will have side effects as gir files
won't be installed in the correct directory. So patch glib-2.0.pc
instead.

Note: autotools-based packages have already been fixed by
https://git.buildroot.net/buildroot/commit/?id=8dda79970661090f202e1f20e5982ba53fdaeb95

Fixes:
 - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae
 - http://autobuild.buildroot.org/results/67a47386019c2a700df348ad6846064e0950e87b
 - http://autobuild.buildroot.org/results/2c6a4470542af574f9407fa5867f0408ec2b4880

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit b094f88a4d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2021-11-12 19:08:02 +01:00
committed by Peter Korsgaard
parent 71e7c4bbc4
commit a02e3ef3be
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch Normal file
View File

@@ -0,0 +1,33 @@
From 04bdfff007c91fc620ed0b7cd02fd2e1e83bdefc Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 12 Nov 2021 18:01:05 +0100
Subject: [PATCH] glib/meson.build: add girdir to glib.2.0.pc
Add girdir to glib-2.0.pc to fix the following build failure with atk:
/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
Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir
Fixes:
- http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
glib/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/glib/meson.build b/glib/meson.build
index f78f32969..6c5486699 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -377,6 +377,7 @@ pkg.generate(libglib,
subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
--
2.33.0