From 6fae6a92cf3d9810dc68438f3b20913453812437 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Jan 2016 18:06:42 +0000 Subject: 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 --- meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch | 20 -------------------- .../glib-2.0/uclibc_musl_translation.patch | 22 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb | 2 +- meta/recipes-core/glib-2.0/glib.inc | 4 ++++ 4 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch (limited to 'meta/recipes-core/glib-2.0') 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.patch deleted file mode 100644 index 2a154fdd4a..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix DATADIRNAME on uclibc/Linux - -translation files are always installed under PREFIX/share/locale in uclibc -based systems therefore lets set DATADIRNAME to "share". - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: glib-2.38.2/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*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch new file mode 100644 index 0000000000..7aa6217d69 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch @@ -0,0 +1,22 @@ +Fix DATADIRNAME on uclibc/Linux + +translation files are always installed under PREFIX/share/locale in uclibc +based systems therefore lets set DATADIRNAME to "share". + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: glib-2.46.1/m4macros/glib-gettext.m4 +=================================================================== +--- 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 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 \ 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 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 () { fi } +do_install_append_libc-musl () { + rm -f ${D}${libdir}/charset.alias +} + RDEPENDS_${PN}-ptest += "\ gnome-desktop-testing \ tzdata \ -- cgit 1.2.3-korg