From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 8 Aug 2016 05:55:42 +0000 (+0800)
Subject: bitbake.conf: change localedir
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FChenQi%2Flocale-fix;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake.conf: change localedir

Previously, localedir is set to "${libdir}/locale". This would result
in locale database installed in '/usr/lib64/locale' in some multilib case.
For example, if we build out a multilib x86-64 self-hosted image and we try
to build projects on this host, things broke and the following error appears.

  Please use a locale setting which supports utf-8.
  Python can't change the filesystem locale after loading so we need a utf-8 when python starts or things won't work.

This is because '/usr/lib/locale' is the default one. And actually the
nativesdk-glibc is now set to use '/usr/lib/locale'.

Thus, we change the setting of 'localedir' to '${nonarch_libdir}/locale' to
fix the above problem.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c32a3f8a666..ed77ee31021 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -44,7 +44,7 @@ export libdir = "${exec_prefix}/${baselib}"
 export libexecdir = "${exec_prefix}/libexec"
 export includedir = "${exec_prefix}/include"
 export oldincludedir = "${exec_prefix}/include"
-localedir = "${libdir}/locale"
+localedir = "${nonarch_libdir}/locale"
 
 # Linkage between native/cross/nativesdk layouts
 base_bindir_native = "/bin"