glib-2.0: Fix locale location on musl

gettext.m4 macro does not detect musl triplets and falls back to
${libdir}/locale

It ends up with lot of packging warning
"files installed but not packaged"

(From OE-Core rev: 6fae6a92cf3d9810dc68438f3b20913453812437)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2016-01-08 18:06:42 +00:00 committed by Richard Purdie
parent 527cd95c17
commit d9134cf0bc
3 changed files with 16 additions and 10 deletions

View File

@ -5,16 +5,18 @@ based systems therefore lets set DATADIRNAME to "share".
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: glib-2.38.2/m4macros/glib-gettext.m4
Index: glib-2.46.1/m4macros/glib-gettext.m4
===================================================================
--- glib-2.38.2.orig/m4macros/glib-gettext.m4 2013-11-07 07:29:13.000000000 -0800
+++ glib-2.38.2/m4macros/glib-gettext.m4 2014-03-15 14:51:54.712135644 -0700
@@ -239,7 +239,7 @@
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-linux-uclibc*)
--- glib-2.46.1.orig/m4macros/glib-gettext.m4
+++ glib-2.46.1/m4macros/glib-gettext.m4
@@ -243,6 +243,10 @@ msgstr ""
CATOBJEXT=.mo
DATADIRNAME=share
;;
+ *-*-musl* | *-*-linux-uclibc*)
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib

View File

@ -11,7 +11,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://glib-2.0-configure-readlink.patch \
file://run-ptest \
file://ptest-paths.patch \
file://uclibc.patch \
file://uclibc_musl_translation.patch \
file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
file://allow-run-media-sdX-drive-mount-if-username-root.patch \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \

View File

@ -79,6 +79,10 @@ do_install_append () {
fi
}
do_install_append_libc-musl () {
rm -f ${D}${libdir}/charset.alias
}
RDEPENDS_${PN}-ptest += "\
gnome-desktop-testing \
tzdata \