diff options
| -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.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 |
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". 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 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 \ |