[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1919/8267] gobject-introspection: Ensure prelink config file exists to avoid build failures

[Emmanuele Bassi <ebassi src gnome org>]

commit d37837a00d0b892c9d11f4ae013f5e389ff3f49d
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Aug 17 12:53:16 2016 +0100

    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>

 .../gobject-introspection_1.48.0.bb                |   13 +++++++++++++
 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 6948aff..eca6ce0 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() {
            -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)
+}