From a4bf020e8cce72ff94f0368f4eca1695d63738ea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Nov 2021 10:35:48 +0100 Subject: [PATCH] package/libgee: fix introspection build Fix the following build failure raised since the addition of introspection in commit 3915e17e7734ee3abe088d4ce1893eecd7cc4663: /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 Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 Fixes: - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...le.am-include-Makefile.introspection.patch | 40 +++++++++++++++++++ package/libgee/libgee.mk | 2 + 2 files changed, 42 insertions(+) create mode 100644 package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch new file mode 100644 index 0000000000..0906275ae3 --- /dev/null +++ b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch @@ -0,0 +1,40 @@ +From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 20 Nov 2021 23:57:33 +0100 +Subject: [PATCH] gee/Makefile.am: include Makefile.introspection + +Include Makefile.introspection instead of using a custom rule which will +result in the following build failure when cross-compiling on buildroot +because of missing --includedir: + +/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 +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 + +Fixes: + - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] +--- + gee/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gee/Makefile.am b/gee/Makefile.am +index 5634bcb..e0d950e 100644 +--- a/gee/Makefile.am ++++ b/gee/Makefile.am +@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ + -l $(libgee_dlname) + Gee-0.8.gir: libgee_0_8_la_vala.stamp + Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la +- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ ++ ++-include $(INTROSPECTION_MAKEFILE) + endif + + MOSTLYCLEANFILES = \ +-- +2.33.0 + diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 48bc9c9e41..0a05a63635 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -12,6 +12,8 @@ LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING +# We're patching gee/Makefile.am +LIBGEE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBGEE_CONF_OPTS += --enable-introspection