[Buildroot] [git commit branch/2021.08.x] package/gobject-introspection: fix --includedir
Peter Korsgaard
peter at korsgaard.com
Mon Sep 13 13:33:15 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=64d6e2a640ac221ec9edc1318d24d245a4344107
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.08.x
Set includedir to $(STAGING_DIR)/usr/share/gir-1.0 instead of . in
Makefile.introspection or g-ir-compiler won't find .gir files resulting
in a build failure for autotools-based based programs such as gconf
since bump of gobject-introspection to version 1.68.0 in commit
abc110e3624aa4e8a9bd8595b3fdc0aec60845e0:
Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir
error parsing file GConf-2.0.gir: Failed to parse included gir GObject-2.0
Fixes:
- http://autobuild.buildroot.org/results/8180d893cbd27512915a7f8a3adb232b93a98ceb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
(cherry picked from commit 8dda79970661090f202e1f20e5982ba53fdaeb95)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/gobject-introspection/gobject-introspection.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index 81938b14df..f34dca7278 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -133,6 +133,12 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
$(SED) "s%typelibdir=.*%typelibdir=\$${prefix}/lib/girepository-1.0%g" \
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+
+ # Set includedir to $(STAGING_DIR)/usr/share/gir-1.0 instead of . or
+ # g-ir-compiler won't find .gir files resulting in a build failure for
+ # autotools-based based programs
+ $(SED) "s%includedir=.%includedir=$(STAGING_DIR)/usr/share/gir-1.0%g" \
+ $(STAGING_DIR)/usr/share/gobject-introspection-1.0/Makefile.introspection
endef
GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
More information about the buildroot
mailing list