summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-02-22 15:58:57 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:09 +0000
commit445d3e60038920cfca9288e892290cc6ea1ec1e6 (patch)
tree66fe85826ad790aed8d193385937966bb3d0cc13 /meta
parent4ffb728df4bdf21daef31d89cfa5771eaf0d90f8 (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc8
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 () {
91 if [ -f ${D}${bindir}/glib-mkenums ]; then 91 if [ -f ${D}${bindir}/glib-mkenums ]; then
92 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums 92 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
93 fi 93 fi
94
95 if [ -e ${D}${libdir}/charset.alias ]; then
96 rm -f ${D}${libdir}/charset.alias
97 fi
94} 98}
95 99
96do_install_append_class-target () { 100do_install_append_class-target () {
@@ -108,10 +112,6 @@ do_install_append_class-target () {
108 fi 112 fi
109} 113}
110 114
111do_install_append_libc-musl () {
112 rm -f ${D}${libdir}/charset.alias
113}
114
115RDEPENDS_${PN}-ptest += "\ 115RDEPENDS_${PN}-ptest += "\
116 gnome-desktop-testing \ 116 gnome-desktop-testing \
117 tzdata \ 117 tzdata \