Mercurial > gub

changeset 45:d1b1d02e1158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert zlib, freetype and fontconfig to lp.org sources
author janneke <janneke@gnu.org>
date Fri, 25 Nov 2005 21:35:34 +0100
parents 598d3a865371
children 43d0705f0a8d
files specs/framework.py specs/gub.py
diffstat 2 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Sat Nov 26 01:12:24 2005 +0100
+++ b/specs/framework.py	Fri Nov 25 21:35:34 2005 +0100
@@ -40,6 +40,11 @@
 		rm -f %(srcdir)s/builds/unix/{unix-def.mk,unix-cc.mk,ftconfig.h,freetype-config,freetype2.pc,config.status,config.log}
 ''')
 		gub.Package.configure (self)
+		self.system ('''
+sed -i~	-e "s@^LIBTOOL=.*@LIBTOOL=%(builddir)s/libtool --tag=CXX@" %(builddir)s/Makefile
+echo '# libtool will not build dll if -no-undefined flag is not present' >> %(builddir)s/Makefile
+echo 'LDFLAGS:=$(LDFLAGS) -no-undefined' >> %(builddir)s/Makefile
+''')
 
 	def install (self):
 		gub.Package.system (self, '''
@@ -77,7 +82,7 @@
 		return cmd
 	
 	def configure (self):
-		Package.system (self, '''
+		gub.Package.system (self, '''
 		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 \
@@ -138,15 +143,19 @@
 		Gettext (settings).with (version='0.14.5'),
 		Libiconv (settings).with (version='1.9.2'),
 		Glib (settings).with (version='2.8.4', mirror=download.gtk),
-		Freetype (settings).with (version='2.1.7', mirror=download.freetype),
+		Zlib (settings).with (version='1.2.2-1', mirror=download.lp, format='bz2'),
+# vanilla 1.2.3 builds only static libraries
+#		Zlib (settings).with (version='1.2.3', mirror=download.zlib, format='bz2'),
+		Freetype (settings).with (version='2.1.7-1', mirror=download.lp, format='bz2'),
+#		Freetype (settings).with (version='2.1.7', mirror=download.freetype),
 # 2.1.9 builds only static libraries
 #		Freetype (settings).with (version='2.1.9', mirror=download.freetype),
 # vanilla expat does not link
 #		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),
+#		Fontconfig (settings).with (version='2.3.2', mirror=download.fontconfig),
+		Fontconfig (settings).with (version='2.3.2-1', mirror=download.lp, format='bz2'),
 		LilyPond (settings).with (mirror=cvs.gnu, download=gub.Package.cvs),
 	),
 	}
--- a/specs/gub.py	Sat Nov 26 01:12:24 2005 +0100
+++ b/specs/gub.py	Fri Nov 25 21:35:34 2005 +0100
@@ -312,7 +312,9 @@
 			'DLLTOOL' : '%(target_architecture)s-dlltool',
 			'DLLWRAP' : '%(target_architecture)s-dllwrap',
 			'LD': '%(target_architecture)s-ld',
-			'LDFLAGS': '-L%(installdir)s/lib',
+#			'LDFLAGS': '-L%(installdir)s/lib',
+# FIXME: for zlib, try adding bin			
+			'LDFLAGS': '-L%(installdir)s/lib -L%(installdir)s/bin',
 			'NM': '%(target_architecture)s-nm',
 			'PKG_CONFIG_PATH': '%(systemdir)s/usr/lib/pkgconfig',
 			'PKG_CONFIG': '''/usr/bin/pkg-config \