Mercurial > gub
changeset 14:9ac7984e774f
env export
| author | hanwen <hanwen@xs4all.nl> |
|---|---|
| date | Fri, 25 Nov 2005 11:16:31 +0100 |
| parents | 3f5c14f974bc |
| children | fa5d9eb6bb32 |
| files | ChangeLog specs/framework.py |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 25 10:30:43 2005 +0100 +++ b/ChangeLog Fri Nov 25 11:16:31 2005 +0100 @@ -1,6 +1,7 @@ 2005-11-25 Han-Wen Nienhuys <hanwen@xs4all.nl> * specs/framework.py (get_packages): different packages for mac. + (Fontconfig.configure): don't export fc env settings globally. * driver.py (main): take platform argument. support mingw-fedora.
--- a/specs/framework.py Fri Nov 25 10:30:43 2005 +0100 +++ b/specs/framework.py Fri Nov 25 11:16:31 2005 +0100 @@ -50,22 +50,21 @@ ''' def configure (self): - os.environ['ft_config'] = '''/usr/bin/freetype-config \ ---prefix=%(systemdir)s \ ---exec-prefix=%(systemdir)s \ -''' - self.system (''' rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log} -''') +''', + env = {'ft_config' : '''/usr/bin/freetype-config \ +--prefix=%(systemdir)s \ +--exec-prefix=%(systemdir)s \ +'''}) gub.Package.configure (self) def get_packages (settings, platform): packages = { 'mac': ( Gettext (settings).with (version='0.10.40'), + Freetype (settings).with (version='2.1.9', mirror=download.freetype), Glib (settings).with (version='2.8.4', mirror=download.gtk), - Freetype (settings).with (version='2.1.9', mirror=download.freetype), ), 'mingw': ( Libtool (settings).with (version='1.5.20'),