summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 12:53:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-18 09:27:52 +0100
commitd37837a00d0b892c9d11f4ae013f5e389ff3f49d (patch)
treebac41ced9bbe91994afb4086e5e6723401c15f6d
parent180a77c56a3aedc7bb4bd8d7d9508ff72ac947b2 (diff)
downloadpoky-d37837a00d0b892c9d11f4ae013f5e389ff3f49d.tar.gz
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>
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb13
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
index 6948aff2fa..eca6ce00a0 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
@@ -158,3 +158,16 @@ gi_binaries_sysroot_preprocess() {
158 -e "s|g_ir_compiler=.*|g_ir_compiler=${bindir}/g-ir-compiler-wrapper|" \ 158 -e "s|g_ir_compiler=.*|g_ir_compiler=${bindir}/g-ir-compiler-wrapper|" \
159 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc 159 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc
160} 160}
161
162# Need to ensure ld.so.conf exists so prelink-native works
163# both before we build and if we install from sstate
164do_configure[prefuncs] += "gobject_introspection_preconfigure"
165python gobject_introspection_preconfigure () {
166 oe.utils.write_ld_so_conf(d)
167}
168
169SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst"
170python gobject_introspection_postinst () {
171 if d.getVar("BB_CURRENTTASK", True).startswith("populate_sysroot"):
172 oe.utils.write_ld_so_conf(d)
173}