summaryrefslogtreecommitdiff
path: root/meta/recipes-core
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 12:54:22 +0000
commitba69323b58071593fa917bf902314eb6eace25a8 (patch)
treed024ff948e71f61d56998969a7c42a99c46967fb /meta/recipes-core
parenta84ac3667d8b216164b80c88866325908c5ad98f (diff)
downloadopenembedded-core-ba69323b58071593fa917bf902314eb6eace25a8.tar.gz
openembedded-core-ba69323b58071593fa917bf902314eb6eace25a8.tar.bz2
openembedded-core-ba69323b58071593fa917bf902314eb6eace25a8.zip
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>
Diffstat (limited to 'meta/recipes-core')
-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 () {
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 \