[oe-commits] org.oe.dev glibc: use QEMU_OPTIONS to generate binary locales for armv6 machines (from Poky)

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5249a366bb4d53c7531eae39339bc5a264436a79
ViewMTN: http://monotone.openembedded.org/revision/info/5249a366bb4d53c7531eae39339bc5a264436a79
Files:
1
packages/glibc/glibc-package.bbclass
Diffs:

#
# mt diff -r94fcaefb1251e50b067edc27e83c02b954cd82fc -r5249a366bb4d53c7531eae39339bc5a264436a79
#
# 
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#    to [ad5d2085797fa01b1f94d1ff231db24757badb90]
# 
============================================================
--- packages/glibc/glibc-package.bbclass	f4791b3fa7f4d093f75d3e760b405eca7feae357
+++ packages/glibc/glibc-package.bbclass	ad5d2085797fa01b1f94d1ff231db24757badb90
@@ -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)