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"

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
similarity index 51%
rename from meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
index 2a154fdd4a0870e4f900d458045a5e632d3c985e..7aa6217d6938c5b77db0d9db0cf1d3ef550865d1 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
@@ -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

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
index 04951f4b6f3ba3c0e994e50a46f6d6d3f7d3c602..937ae651e2ac9569b6dc94563232e42b364e5b24 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
@@ -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 \

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 06e682564376c511f4b03b6ceff8c46bc101236e..eff59970d5acce89880ec855386b660863be659a 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -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 \