[OE-core] [PATCH 2/2] glib-2.0/glib.inc: If 'charset.alias' exists drop it
Nathan Rossi
nathan at nathanrossi.com
Mon Jan 30 07:45:52 UTC 2017
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 at nathanrossi.com>
---
meta/recipes-core/glib-2.0/glib.inc | 8 ++++----
1 file 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 d0e0c256ba..3367ac9153 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -97,6 +97,10 @@ do_install_append () {
rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+
+ if [ -e ${D}${libdir}/charset.alias ]; then
+ rm -f ${D}${libdir}/charset.alias
+ fi
}
do_install_append_class-target () {
@@ -106,10 +110,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 \
--
2.11.0
More information about the Openembedded-core
mailing list