diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
| commit | ba69123b245d6244b756a07f7118bfb11acb47f0 (patch) | |
| tree | 6c0f87cbb91fb142e9b748fdc2628e8390f5edd0 /packages/glibc/glibc-package.bbclass | |
| parent | 25fe9599d951a3de39a2e8983810f2c6a40d74b0 (diff) | |
| parent | b1fbc8c1b11f8c30bf327b4605defac0a3d47457 (diff) | |
merge of '1d06736abd89e6b42d2eaf5918fcd17ad518fcb3'
and '3601bc2cdb1e980ccaf4f1de781d948df8d45545'
Diffstat (limited to 'packages/glibc/glibc-package.bbclass')
| -rw-r--r-- | packages/glibc/glibc-package.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 50fae44bf3..bd1cb4f4e4 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -271,7 +271,12 @@ 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) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + + 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): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) |