summaryrefslogtreecommitdiffstats
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:41 +0000
commit7d95e81a561e71a7f36ab4b2a1fc85fe8f908705 (patch)
treea29948fc2e8ad5eb8d2ae5be4f8ee6940caafd2a
parent62b3851fdcf21e5729217a4b2fbb9551e6094d13 (diff)
downloadpoky-7d95e81a561e71a7f36ab4b2a1fc85fe8f908705.tar.gz
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 (From OE-Core rev: 7897ab5f54d2dc21795b2a53b82b9c911157f0ca) 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 @@
1Fix DATADIRNAME on uclibc/Linux
2
3translation files are always installed under PREFIX/share/locale in uclibc
4based systems therefore lets set DATADIRNAME to "share".
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8Index: glib-2.38.2/m4macros/glib-gettext.m4
9===================================================================
10--- glib-2.38.2.orig/m4macros/glib-gettext.m4 2013-11-07 07:29:13.000000000 -0800
11+++ glib-2.38.2/m4macros/glib-gettext.m4 2014-03-15 14:51:54.712135644 -0700
12@@ -239,7 +239,7 @@
13 [CATOBJEXT=.mo
14 DATADIRNAME=lib])
15 ;;
16- *-*-openbsd*)
17+ *-*-openbsd* | *-*-linux-uclibc*)
18 CATOBJEXT=.mo
19 DATADIRNAME=share
20 ;;
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 \
15 file://ptest-paths.patch \ 15 file://ptest-paths.patch \
16 file://gtest-skip-fixes.patch \ 16 file://gtest-skip-fixes.patch \
17 file://gio-test-race.patch \ 17 file://gio-test-race.patch \
18 file://uclibc.patch \
18 " 19 "
19 20
20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"