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.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index bbac7ebd328a658a016805289456d7aba81130b2..6600d33dcd01ee81a6b5473bbdcab2ba6519da01 100644 (file)
--- 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 \