[oe-commits] [openembedded-core] 03/17: gobject-introspection: Ensure prelink config file exists to avoid build failures

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit bf945371435644d80382d4ac86ee634cae439a17
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: 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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../gobject-introspection/gobject-introspection_1.48.0.bb   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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)
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.