aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-03-22 10:28:54 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-03-22 22:44:38 +0100
commit978d835640e64822302d4d1be24eb47880e1804e (patch)
tree0ed3d674c9f5f17f73575e71a5dfafd92d0d0f9a
parent1c6f0097dfdc161c9a63dc4ef94ed3d355c61b98 (diff)
downloadbuildroot-978d835640e64822302d4d1be24eb47880e1804e.tar.gz
buildroot-978d835640e64822302d4d1be24eb47880e1804e.tar.bz2
package/libostree: enable introspection
libostree build fails when introspection is enabled: ./.libs/libostree-1.so: error adding symbols: File in wrong format collect2: error: ld returned 1 exit status src/libostree/ostree-repo-deprecated.h:28: Warning: OSTree: symbol='G_GNUC_DEPRECATED_FOR': Skipping foreign symbol from namespace Gio linking of temporary binary failed: Command '['/bin/bash', './libtool', '--mode=link', '--tag=CC', '--silent', 'gcc', [...] ]' returned non-zero exit status 1. This is because the build system for libostree hard-codes CC=gcc when calling the GOI scanner, which obviously causes build failures when in cross-compilation. In d264351cfcca (package/libostree: disable introspection), we just papered over the problem by forcibly disabling introspection altogether. Turns out the fix is realatively simple: we can just override the INTROSPECTION_SCANNER_ENV variable when calling make, which will revert to the behaviour we expect: to use the cross-compiler in the GOI scanner wrapper. Thanks to Adam for pointing out at INTROSPECTION_SCANNER_ENV in the first place. :-) Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Marcus Folkesson <marcus.folkesson@gmail.com> Cc: Adam Duskett <aduskett@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/libostree/libostree.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk
index ff763b20f9..aed97b70cc 100644
--- a/package/libostree/libostree.mk
+++ b/package/libostree/libostree.mk
@@ -21,9 +21,16 @@ LIBOSTREE_CONF_OPTS += \
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
- --disable-introspection \
--disable-man
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+LIBOSTREE_DEPENDENCIES += gobject-introspection
+LIBOSTREE_CONF_OPTS += --enable-introspection
+LIBOSTREE_MAKE_OPTS = INTROSPECTION_SCANNER_ENV=
+else
+LIBOSTREE_CONF_OPTS += --disable-introspection
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBOSTREE_CONF_OPTS += --with-openssl
LIBOSTREE_DEPENDENCIES += openssl