Skip to contentSkip to conversation

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

PATCH New Richard Purdie 1 participant 1 message Aug 17, 2016

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb +13 -0
index 6948aff..eca6ce0 100644
@@ -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)
+}