[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3573/8267] attr: Convert SSTATEPOSTINSTFUNCS to a do_install_append

[Emmanuele Bassi <ebassi src gnome org>]

commit ace9e1d37124a294d72ad75a71d36098cfe6eac4
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Dec 7 12:07:31 2016 +0000

    attr: Convert SSTATEPOSTINSTFUNCS to a do_install_append
    
    A SSTATEPOSTINSTFUNCS function here is overkill, just do this in a
    do_install_append_class-native and create relative symlinks rather
    than absolute ones which would then have to be relocated.
    
    (From OE-Core rev: 518e8d0216b0f42f574e42288804f553b9ff6f99)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/attr/ea-acl.inc |   47 ++++++++++++++++------------------
 1 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 370e16f..583ca1f 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -17,36 +17,33 @@ do_install () {
        oe_runmake install install-lib install-dev DIST_ROOT="${D}"
 }
 
-PACKAGES =+ "lib${BPN}"
-
-FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
-
-BBCLASSEXTEND = "native"
-# Only append ldflags for target recipe and if USE_NLS is enabled
-LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}"
-EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 
'no')]}"
-
-fix_symlink () {
-       if [ "${BB_CURRENTTASK}" != "populate_sysroot" -a "${BB_CURRENTTASK}" != "populate_sysroot_setscene" ]
-       then
-               return
-       fi
-
+do_install_append_class-native () {
        if test "${libdir}" = "${base_libdir}" ; then
                return
        fi
+       librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir', True))}
+       baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir', True))}
+
        # Remove bad symlinks & create the correct symlinks
-       if test -L ${libdir}/lib${BPN}.so ; then
-               rm -rf ${libdir}/lib${BPN}.so
-               ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
+       if test -L ${D}${libdir}/lib${BPN}.so ; then
+               rm -rf ${D}${libdir}/lib${BPN}.so
+               ln -sf $baselibrelpath/lib${BPN}.so ${D}${libdir}/lib${BPN}.so
        fi
-       if test -L ${base_libdir}/lib${BPN}.a ; then
-               rm -rf ${base_libdir}/lib${BPN}.a
-               ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
+       if test -L ${D}${base_libdir}/lib${BPN}.a ; then
+               rm -rf ${D}${base_libdir}/lib${BPN}.a
+               ln -sf $librelpath/lib${BPN}.a ${D}${base_libdir}/lib${BPN}.a
        fi
-       if test -L  ${base_libdir}/lib${BPN}.la ; then
-               rm -rf ${base_libdir}/lib${BPN}.la
-               ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
+       if test -L  ${D}${base_libdir}/lib${BPN}.la ; then
+               rm -rf ${D}${base_libdir}/lib${BPN}.la
+               ln -sf $librelpath/lib${BPN}.la ${D}${base_libdir}/lib${BPN}.la
        fi
 }
-SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
+
+PACKAGES =+ "lib${BPN}"
+
+FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
+
+BBCLASSEXTEND = "native"
+# Only append ldflags for target recipe and if USE_NLS is enabled
+LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}"
+EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 
'no')]}"