Mercurial > gub
changeset 3174:6920d9668664
plug LD_LIBRARY_PATH leakage.
| author | Han-Wen Nienhuys <hanwen@lilypond.org> |
|---|---|
| date | Sat, 07 Apr 2007 12:43:54 -0300 |
| parents | f260043738b1 |
| children | f146417fc14a |
| files | lib/settings.py lib/toolpackage.py lilypond.make |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/settings.py Sat Apr 07 01:41:40 2007 -0300 +++ b/lib/settings.py Sat Apr 07 12:43:54 2007 -0300 @@ -99,7 +99,9 @@ self.cpu_count_str = '%d' % os.sysconf ('SC_NPROCESSORS_ONLN') except ValueError: self.cpu_count_str = '1' - + + # make sure we don't import build system. + self.LD_LIBRARY_PATH = '%(system_root)s/usr/lib' def verbose (self): try: return self.options.verbose
--- a/lib/toolpackage.py Sat Apr 07 01:41:40 2007 -0300 +++ b/lib/toolpackage.py Sat Apr 07 12:43:54 2007 -0300 @@ -27,8 +27,8 @@ dir = os.path.dirname (e) file = os.path.basename (e) self.system ('mv %(e)s %(dir)s/.%(file)s', locals ()) - self.dump ('''#! /bin/sh -LD_LIBRARY_PATH=%(system_root)s/usr/lib:$LD_LIBRARY_PATH + self.dump ('''#!/bin/sh +LD_LIBRARY_PATH=%(system_root)s/usr/lib %(system_root)s/usr/bin/.%(file)s "$@" ''', e, env=locals ()) os.chmod (e, 0755)
--- a/lilypond.make Sat Apr 07 01:41:40 2007 -0300 +++ b/lilypond.make Sat Apr 07 12:43:54 2007 -0300 @@ -249,7 +249,7 @@ PATH=$(CWD)/target/local/system/usr/bin:$(NATIVE_ROOT)/usr/bin:$$PATH \ GS_LIB=$(wildcard $(NATIVE_ROOT)/usr/share/ghostscript/*/lib) \ MALLOC_CHECK_=2 \ - LD_LIBRARY_PATH=$(NATIVE_ROOT)/usr/lib:$$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$(NATIVE_ROOT)/usr/lib SIGNATURE_FUNCTION=uploads/signatures/$(1).$(NATIVE_BUILD_COMMITTISH)