From 6065fa491c009118ae282ae933215649cccfcd24 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 15 May 2009 16:25:49 +0400 Subject: (e)glibc-package: set LD_LIBRARY_PATH on binary locale generation Locale generation might fail with SIGSEGV if host libs get messed with target libs, that might easily happen via /etc/ld.so.cache when building x86(_64) target on x86(_64) host. So explicitly specify LD_LIBRARY_PATH to prevent that. Acked-by: Tom Rini --- recipes/glibc/glibc-package.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes/glibc/glibc-package.bbclass') diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 8db8c5cb6f..46f809e22b 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -273,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") @@ -282,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) -- cgit v1.2.3