[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4850/8267] glib-2.0/glib.inc: If 'charset.alias' exists drop it

[Emmanuele Bassi <ebassi src gnome org>]

commit 445d3e60038920cfca9288e892290cc6ea1ec1e6
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Wed Feb 22 15:58:57 2017 +1000

    glib-2.0/glib.inc: If 'charset.alias' exists drop it
    
    Delete the 'charset.alias' file during the do_install task if it exists.
    This file is not shipped in any packages and on the targets that it is
    generated (musl and mingw32) it is undesired.
    
    (From OE-Core rev: ba69323b58071593fa917bf902314eb6eace25a8)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/glib-2.0/glib.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index bbac7eb..6600d33 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -91,6 +91,10 @@ do_install_append () {
        if [ -f ${D}${bindir}/glib-mkenums ]; then
                sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
        fi
+
+       if [ -e ${D}${libdir}/charset.alias ]; then
+               rm -f ${D}${libdir}/charset.alias
+       fi
 }
 
 do_install_append_class-target () {
@@ -108,10 +112,6 @@ do_install_append_class-target () {
        fi
 }
 
-do_install_append_libc-musl () {
-       rm -f ${D}${libdir}/charset.alias
-}
-
 RDEPENDS_${PN}-ptest += "\
             gnome-desktop-testing \
             tzdata \