From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 16 Mar 2014 05:42:31 +0000 (-0700)
Subject: intltool: Define DATADIRNAME=share for uclibc based systems
X-Git-Tag: 2015-4~3343
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=511121dc1867279f2483ddf236e4c64c90bc8acb;p=openembedded-core.git

intltool: Define DATADIRNAME=share for uclibc based systems

This otherwise makes localedir to point to prefix/lib
which is wrong location for locale splitting and we end
with unpackaged locale files e.g. systemd throws this

WARNING: QA Issue: systemd: Files/directories were installed but not
shipped
  /usr/lib/locale
  /usr/lib/locale/fr
  /usr/lib/locale/pl
  /usr/lib/locale/ru
  /usr/lib/locale/it
  /usr/lib/locale/fr/LC_MESSAGES
  /usr/lib/locale/fr/LC_MESSAGES/systemd.mo
  /usr/lib/locale/pl/LC_MESSAGES
  /usr/lib/locale/pl/LC_MESSAGES/systemd.mo
  /usr/lib/locale/ru/LC_MESSAGES
  /usr/lib/locale/ru/LC_MESSAGES/systemd.mo
  /usr/lib/locale/it/LC_MESSAGES
  /usr/lib/locale/it/LC_MESSAGES/systemd.mo

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

diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
new file mode 100644
index 0000000000..145c181f17
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
@@ -0,0 +1,19 @@
+on uclibc systems localedir should point to /usr/'share' as usual.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: intltool-0.50.2/intltool.m4
+===================================================================
+--- intltool-0.50.2.orig/intltool.m4	2014-03-15 22:09:01.016627665 -0700
++++ intltool-0.50.2/intltool.m4	2014-03-15 22:12:09.732631206 -0700
+@@ -173,6 +173,9 @@
+     AC_CHECK_FUNC(bind_textdomain_codeset,
+       [DATADIRNAME=share], [DATADIRNAME=lib])
+     ;;
++    *-*-*uclibc*)
++    [DATADIRNAME=share]
++    ;;
+     *)
+     [DATADIRNAME=lib]
+     ;;
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.2.bb b/meta/recipes-devtools/intltool/intltool_0.50.2.bb
index dffce2150b..483239d472 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.2.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.2.bb
@@ -3,6 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI += "file://intltool-nowarn.patch \
+           file://uclibc.patch \
            ${NATIVEPATCHES} \
            "