Mercurial > gub
changeset 36:20d755d88fa7
Add zlib. More fontconfig
| author | janneke <janneke@gnu.org> |
|---|---|
| date | Fri, 25 Nov 2005 16:04:10 +0100 |
| parents | 9a1fbf9c845c |
| children | d412e2bcc8c1 |
| files | specs/download.py specs/framework.py specs/gub.py |
| diffstat | 3 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/specs/download.py Fri Nov 25 14:29:15 2005 +0100 +++ b/specs/download.py Fri Nov 25 16:04:10 2005 +0100 @@ -23,3 +23,6 @@ def lp (): return 'http://lilypond.org/mingw/uploads/%(name)s/%(name)s-%(version)s-src.tar.%(format)s' + +def zlib (): + return 'http://www.zlib.net/%(name)s-%(version)s.tar.%(format)s'
--- a/specs/framework.py Fri Nov 25 14:29:15 2005 +0100 +++ b/specs/framework.py Fri Nov 25 16:04:10 2005 +0100 @@ -57,6 +57,10 @@ return gub.Target_package.configure_command (self) + ''' \ --with-default-fonts=@WINDIR@\\fonts \ --with-add-fonts=@INSTDIR@\\usr\\share\\gs\\fonts \ +--with-freetype-config="/usr/bin/freetype-config \ +--prefix=%(systemdir)s/usr \ +--exec-prefix=%(systemdir)s/usr \ +" ''' def configure (self): @@ -64,8 +68,8 @@ 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 \ +--prefix=%(systemdir)s/usr \ +--exec-prefix=%(systemdir)s/usr \ '''}) gub.Package.configure (self) @@ -99,6 +103,14 @@ man1dir=%(installdir)s/share/man/man1 \ ''' +class Zlib (gub.Target_package): + def configure (self): + self.system (''' +sed -i~ 's/mgwz/libz/' %(srcdir)s/configure +shtool mkshadow %(srcdir)s %(builddir)s +cd %(builddir)s && target=mingw AR="%(AR)s r" %(srcdir)s/configure --shared +''') + def get_packages (settings, platform): packages = { 'mac': ( @@ -115,6 +127,7 @@ # Expat (settings).with (version='1.95.8', mirror=download.sf), Expat (settings).with (version='1.95.8-1', mirror=download.lp, format='bz2'), # Fontconfig (settings).with (version='2.3.92', mirror=download.fontconfig), + Zlib (settings).with (version='1.2.3', mirror=download.zlib, format='bz2'), Fontconfig (settings).with (version='2.3.2', mirror=download.fontconfig), LilyPond (settings).with (mirror=cvs.gnu, download=gub.Package.cvs), ),
--- a/specs/gub.py Fri Nov 25 14:29:15 2005 +0100 +++ b/specs/gub.py Fri Nov 25 16:04:10 2005 +0100 @@ -280,6 +280,12 @@ 'LD': '%(target_architecture)s-ld', 'LDFLAGS': '-L%(installdir)s/lib', 'NM': '%(target_architecture)s-nm', + 'PKG_CONFIG_PATH': '%(systemdir)s/usr/lib/pkgconfig', + 'PKG_CONFIG': '''/usr/bin/pkg-config \ +--define-variable prefix=%(systemdir)s/usr \ +--define-variable includedir=%(systemdir)s/usr/include \ +--define-variable libdir=%(systemdir)s/usr/lib \ +''', 'RANLIB': '%(target_architecture)s-ranlib', 'SED': 'sed', # libtool (expat mingw) fixup }