Patchwork [4/7] glib-2.0: Fix localedir expectations for uclibc

login
register
mail settings
Submitter Khem Raj
Date March 16, 2014, 5:42 a.m.
Message ID <4fe38ebdc644fa0880bd83bcf3325fd34070a73e.1394948105.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/68703/
State Accepted
Commit 7d95e81a561e71a7f36ab4b2a1fc85fe8f908705
Headers show

Comments

Khem Raj - March 16, 2014, 5:42 a.m.
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>
---
 meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch | 20 ++++++++++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb    |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
Ross Burton - March 18, 2014, 11:13 a.m.
On 16 March 2014 05:42, Khem Raj <raj.khem@gmail.com> wrote:
> ++          *-*-openbsd* | *-*-linux-uclibc*)

Does uclibc have the same file naming as bsd?  eglibc uses .gmo.

Ross
Khem Raj - March 18, 2014, 2:19 p.m.
On Tuesday, March 18, 2014, Burton, Ross <ross.burton@intel.com> wrote:

> On 16 March 2014 05:42, Khem Raj <raj.khem@gmail.com <javascript:;>>
> wrote:
> > ++          *-*-openbsd* | *-*-linux-uclibc*)
>
> Does uclibc have the same file naming as bsd?  eglibc uses .gmo.
>
>
It uses .mo


> Ross
>

Patch

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 0000000..2a154fd
--- /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 6c336f7..4052950 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"