glibc: use QEMU_OPTIONS to generate binary locales for armv6 machines (from Poky)

diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 50fae44..bd1cb4f 100644 (file)
--- 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)