summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-12-04 17:19:25 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-12-04 17:19:25 +0000
commite9f81f1d31223c14513ed2fc9276bf0564618a6d (patch)
tree849b015f3f56495f1a9a9ad8cd970a478bf5f3f3
parentde38769a25eac9370ac352e52b61e3061e44801c (diff)
downloadopenembedded-core-e9f81f1d31223c14513ed2fc9276bf0564618a6d.tar.gz
openembedded-core-e9f81f1d31223c14513ed2fc9276bf0564618a6d.tar.bz2
openembedded-core-e9f81f1d31223c14513ed2fc9276bf0564618a6d.zip
glibc: get proper value for QEMU_OPTIONS to get binary locales working for all ARM variants
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3307 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/glibc/glibc-package.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index 1dc1f9c133..01b55f3b33 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -260,7 +260,11 @@ python package_do_split_gconvs () {
i18npath = base_path_join(treedir, datadir, "i18n")
localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
- qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1)
+
+ qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1)
+ if not qemu_options:
+ qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1)
+
cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts)
bb.note("generating locale %s (%s)" % (locale, encoding))
if os.system(cmd):