From 8dda79970661090f202e1f20e5982ba53fdaeb95 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 Sep 2021 21:13:06 +0200 Subject: [PATCH] package/gobject-introspection: fix --includedir 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 -- 2.30.2