From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [80.91.229.2] (helo=ciao.gmane.org) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1MM6Je-0003wW-SI for openembedded-devel@openembedded.org; Wed, 01 Jul 2009 22:22:02 +0200 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1MM682-0007V4-LC for openembedded-devel@openembedded.org; Wed, 01 Jul 2009 20:10:02 +0000 Received: from s55917625.adsl.wanadoo.nl ([85.145.118.37]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Jul 2009 20:10:02 +0000 Received: from k.kooi by s55917625.adsl.wanadoo.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Jul 2009 20:10:02 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@openembedded.org From: Koen Kooi Date: Wed, 01 Jul 2009 21:15:56 +0200 Message-ID: References: <200907011817.02564.marcin@juszkiewicz.com.pl> <1246474461-16671-6-git-send-email-marcin@juszkiewicz.com.pl> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: s55917625.adsl.wanadoo.nl User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1pre) Gecko/20090622 Shredder/3.0b3pre In-Reply-To: <1246474461-16671-6-git-send-email-marcin@juszkiewicz.com.pl> Sender: news Subject: Re: [STABLE][PATCH 011/125] (e)glibc-package: set LD_LIBRARY_PATH on binary locale generation X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2009 20:22:03 -0000 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 01-07-09 20:54, Marcin Juszkiewicz wrote: > From: Roman I Khimov > > 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 > Signed-off-by: Marcin Juszkiewicz Acked-by: Koen Kooi > --- > recipes/eglibc/eglibc-package.bbclass | 3 ++- > recipes/glibc/glibc-package.bbclass | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass > index 01f698a..241499f 100644 > --- a/recipes/eglibc/eglibc-package.bbclass > +++ b/recipes/eglibc/eglibc-package.bbclass > @@ -309,11 +309,12 @@ 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") > > 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) > + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, 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) > diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass > index 8db8c5c..46f809e 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)