[oe-commits] Lianhao Lu : libc-package.bbclass: Replace hard coded libdir.
git version control
git at git.openembedded.org
Tue Jun 28 11:09:44 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 1609fd2b6582667106a6f065cfa031f68cee7552
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1609fd2b6582667106a6f065cfa031f68cee7552
Author: Lianhao Lu <lianhao.lu at intel.com>
Date: Thu Jun 23 18:59:39 2011 +0800
libc-package.bbclass: Replace hard coded libdir.
Replace the hard coded libdir for locale generating to meet the multilib
requirement.
Signed-off-by: Lianhao Lu <lianhao.lu at intel.com>
---
meta/classes/libc-package.bbclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 5737af4..4bc58c8 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -253,10 +253,11 @@ python package_do_split_gconvs () {
def output_locale_binary(name, pkgname, locale, encoding):
treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
- ldlibdir = "%s/lib" % treedir
+ ldlibdir = base_path_join(treedir, bb.data.getVar("base_libdir", d, 1))
path = bb.data.getVar("PATH", d, 1)
i18npath = base_path_join(treedir, datadir, "i18n")
gconvpath = base_path_join(treedir, "iconvdata")
+ outputpath = base_path_join(treedir, libdir, "locale")
use_cross_localedef = bb.data.getVar("LOCALE_GENERATION_WITH_CROSS-LOCALEDEF", d, 1) or "0"
if use_cross_localedef == "1":
@@ -276,8 +277,8 @@ python package_do_split_gconvs () {
raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
localedef_opts += " --force --old-style --no-archive --prefix=%s \
- --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/usr/lib/locale/%s" \
- % (treedir, treedir, datadir, locale, encoding, treedir, name)
+ --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
+ % (treedir, treedir, datadir, locale, encoding, outputpath, name)
cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \
(path, i18npath, gconvpath, localedef_opts)
More information about the Openembedded-commits
mailing list