diff options
Diffstat (limited to 'recipes/glibc/glibc-package.bbclass')
| -rw-r--r-- | recipes/glibc/glibc-package.bbclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 89fbd1ca72..ac7e0f3670 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.*" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" @@ -252,7 +252,11 @@ python package_do_split_gconvs () { if target_arch in ("i486", "i586", "i686"): target_arch = "i386" - qemu = "qemu-%s -s 1048576 -r 2.6.16" % target_arch + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: @@ -269,6 +273,7 @@ python package_do_split_gconvs () { bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") @@ -278,7 +283,7 @@ python package_do_split_gconvs () { 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) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, 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) |