package/libostree: enable introspection
PATCH v2 1/1 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 fir libiostree 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. :-)
---
Note: this is an alternate proposal to replace a previous series by Adam:
https://patchwork.ozlabs.org/project/buildroot/list/?series=165777 --- package/libostree/libostree.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
package/libostree/libostree.mk +8 -1
@@ -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
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH v2 1/1 package/libostree: enable introspection
Quoted 27 lines · On Sun, 22 Mar 2020 10:28:54 +0100 "Yann E. MORIN" <[email protected]>…
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 fir libiostree 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_ENVvariable 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_ENVin the first place. :-)Signed-off-by Yann E. MORIN <[email protected]>Cc Marcus Folkesson <[email protected]>Cc Adam Duskett <[email protected]>Cc Fabrice Fontaine <[email protected]>
Quoted 7 lines
---
Note: this is an alternate proposal to replace a previous series by Adam:https://patchwork.ozlabs.org/project/buildroot/list/?series=165777 --- package/libostree/libostree.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com