diff options
| author |   Nathan Rossi <nathan@nathanrossi.com> | 2017-02-22 15:58:57 +1000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:09 +0000 |
| commit | 445d3e60038920cfca9288e892290cc6ea1ec1e6 (patch) | |
| tree | 66fe85826ad790aed8d193385937966bb3d0cc13 | |
| parent | 4ffb728df4bdf21daef31d89cfa5771eaf0d90f8 (diff) | |
| download | openembedded-core-contrib-445d3e60038920cfca9288e892290cc6ea1ec1e6.tar.gz | |
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>
| -rw-r--r-- | 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 bbac7ebd32..6600d33dcd 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 \ |