From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 16 Mar 2014 05:42:29 +0000 (-0700)
Subject: glib-2.0: Fix localedir expectations for uclibc
X-Git-Tag: 2015-4~3345
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7897ab5f54d2dc21795b2a53b82b9c911157f0ca;p=openembedded-core.git

glib-2.0: Fix localedir expectations for uclibc

DATADIRNAME is used by many applications using autotools
to install locale data, we get a wrong value for uclibc
systems since it does not recognise it as proper linux
systems and start putting locale info in /usr/lib instead
of /usr/share

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
new file mode 100644
index 0000000000..2a154fdd4a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
@@ -0,0 +1,20 @@
+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 <raj.khem@gmail.com>
+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_2.38.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
index 6c336f72fe..40529503ba 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://ptest-paths.patch \
            file://gtest-skip-fixes.patch \
            file://gio-test-race.patch \
+           file://uclibc.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"