gobject-introspection: Ensure prelink config file exists to avoid build failures

gobject-introspection relies upon prelink-rtld. In order to function correctly,
we generate an ld.so.conf file which is generated before users of prelink-rtld
are called.

There is currently a race in gobject-introspection since the configuration file
may not have been created. This adds in code to ensure that regardless of codepath
(new build, existing build, from sstate), we trigger the creation of the configuration
file and avoid build failures.

(From OE-Core rev: 10e0c1a3a452baa05d160a92a54b2e33cf0fd061)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-08-17 12:53:16 +01:00
parent 180a77c56a
commit d37837a00d

View File

@@ -158,3 +158,16 @@ gi_binaries_sysroot_preprocess() {
-e "s|g_ir_compiler=.*|g_ir_compiler=${bindir}/g-ir-compiler-wrapper|" \
${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc
}
# Need to ensure ld.so.conf exists so prelink-native works
# both before we build and if we install from sstate
do_configure[prefuncs] += "gobject_introspection_preconfigure"
python gobject_introspection_preconfigure () {
oe.utils.write_ld_so_conf(d)
}
SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst"
python gobject_introspection_postinst () {
if d.getVar("BB_CURRENTTASK", True).startswith("populate_sysroot"):
oe.utils.write_ld_so_conf(d)
}