summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-03-15 22:42:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-17 14:01:06 +0000
commit7897ab5f54d2dc21795b2a53b82b9c911157f0ca (patch)
tree56b80bddc3aca421473613c95a822df0b123a1e1
parent9f09353a1548d392a3f71e800be8e1b849960584 (diff)
downloadopenembedded-core-7897ab5f54d2dc21795b2a53b82b9c911157f0ca.tar.gz
openembedded-core-7897ab5f54d2dc21795b2a53b82b9c911157f0ca.tar.bz2
openembedded-core-7897ab5f54d2dc21795b2a53b82b9c911157f0ca.zip
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>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch20
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb1
2 files changed, 21 insertions, 0 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.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"