Patchwork [6/7] intltool: Define DATADIRNAME=share for uclibc based systems

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

Comments

Khem Raj - March 16, 2014, 5:42 a.m.
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>
---
 .../intltool/intltool-0.50.2/uclibc.patch             | 19 +++++++++++++++++++
 meta/recipes-devtools/intltool/intltool_0.50.2.bb     |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch

Patch

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 0000000..145c181
--- /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 dffce21..483239d 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} \
            "