summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-08 18:06:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:32 +0000
commitd9134cf0bcdbc60ba2f3012edc10e652d4894f51 (patch)
tree8abb789a15538f348f97eb57005266474a297839
parent527cd95c17ab387f6b50f2bfd83c2863ed65eacc (diff)
downloadpoky-d9134cf0bcdbc60ba2f3012edc10e652d4894f51.tar.gz
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>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch (renamed from meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch)20
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
3 files changed, 16 insertions, 10 deletions
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
index 2a154fdd4a..7aa6217d69 100644
--- 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".
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending 7Upstream-Status: Pending
8Index: glib-2.38.2/m4macros/glib-gettext.m4 8Index: glib-2.46.1/m4macros/glib-gettext.m4
9=================================================================== 9===================================================================
10--- glib-2.38.2.orig/m4macros/glib-gettext.m4 2013-11-07 07:29:13.000000000 -0800 10--- glib-2.46.1.orig/m4macros/glib-gettext.m4
11+++ glib-2.38.2/m4macros/glib-gettext.m4 2014-03-15 14:51:54.712135644 -0700 11+++ glib-2.46.1/m4macros/glib-gettext.m4
12@@ -239,7 +239,7 @@ 12@@ -243,6 +243,10 @@ msgstr ""
13 [CATOBJEXT=.mo
14 DATADIRNAME=lib])
15 ;;
16- *-*-openbsd*)
17+ *-*-openbsd* | *-*-linux-uclibc*)
18 CATOBJEXT=.mo 13 CATOBJEXT=.mo
19 DATADIRNAME=share 14 DATADIRNAME=share
20 ;; 15 ;;
16+ *-*-musl* | *-*-linux-uclibc*)
17+ CATOBJEXT=.gmo
18+ DATADIRNAME=share
19+ ;;
20 *)
21 CATOBJEXT=.mo
22 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 04951f4b6f..937ae651e2 100644
--- 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 \
11 file://glib-2.0-configure-readlink.patch \ 11 file://glib-2.0-configure-readlink.patch \
12 file://run-ptest \ 12 file://run-ptest \
13 file://ptest-paths.patch \ 13 file://ptest-paths.patch \
14 file://uclibc.patch \ 14 file://uclibc_musl_translation.patch \
15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ 15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
17 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 17 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 06e6825643..eff59970d5 100644
--- 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 () {
79 fi 79 fi
80} 80}
81 81
82do_install_append_libc-musl () {
83 rm -f ${D}${libdir}/charset.alias
84}
85
82RDEPENDS_${PN}-ptest += "\ 86RDEPENDS_${PN}-ptest += "\
83 gnome-desktop-testing \ 87 gnome-desktop-testing \
84 tzdata \ 88 tzdata \