diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-01 21:58:19 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-01 21:58:19 +0000 |
| commit | bd607171760c733930b955f591e156717651fc1f (patch) | |
| tree | 5732229445fa8b10ae1080384c13a9fb3e43f61a | |
| parent | 69bf4d918b195af2693419740bdc917cb1a2707a (diff) | |
| parent | b690ceb60f016853f3705c0d7c854723253806e7 (diff) | |
merge of '1a24470f67b2aef1d747c4c3f8412c0fdb330f5d'
and '5249a366bb4d53c7531eae39339bc5a264436a79'
| -rw-r--r-- | conf/bitbake.conf | 5 | ||||
| -rw-r--r-- | packages/glibc/glibc-package.bbclass | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 858e411d8c..de526f0e56 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -93,6 +93,11 @@ PACKAGE_ARCH = "${HOST_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +# select proper CPU to get binary locales generated +QEMU_OPTIONS = "" +QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" +QEMU_OPTIONS_armv6 = "-cpu arm1136" + ################################################################## # Date/time variables. ################################################################## 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) |