mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-27 15:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/libgee: fix introspection build

Browse Source 
Fix the following build failure raised since the addition of
introspection in commit 3915e17e77:

/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 <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2021-11-21 10:35:48 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 2da1267c1e
commit a4bf020e8c
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch Normal file
View File

@ -0,0 +1,40 @@
From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
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 <fontaine.fabrice@gmail.com>
[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

2
package/libgee/libgee.mk
View File

@ -12,6 +12,8 @@ LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2
LIBGEE_INSTALL_STAGING = YES LIBGEE_INSTALL_STAGING = YES
LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE = LGPL-2.1+
LIBGEE_LICENSE_FILES = COPYING LIBGEE_LICENSE_FILES = COPYING
# We're patching gee/Makefile.am
LIBGEE_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
LIBGEE_CONF_OPTS += --enable-introspection LIBGEE_CONF_OPTS += --enable-introspection