Mercurial > gub

changeset 990:dcf72b375947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tweaks for virginal compile.
author hanwen <hanwen@xs4all.nl>
date Fri, 13 Jan 2006 09:07:33 +0100
parents 21fa90817df2
children 141b614913d9
files specs/framework.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/specs/framework.py	Fri Jan 13 09:07:14 2006 +0100
+++ b/specs/framework.py	Fri Jan 13 09:07:33 2006 +0100
@@ -326,6 +326,9 @@
 
 	def configure (self):
 		self.autoupdate ()
+	
+
+	def do_configure (self):
 		if not os.path.exists (self.expand ('%(builddir)s/FlexLexer.h')):
 			flex = self.read_pipe ('which flex')
 			flex_include_dir = os.path.split (flex)[0] + "/../include"
@@ -333,8 +336,6 @@
 mkdir -p %(builddir)s
 cp %(flex_include_dir)s/FlexLexer.h %(builddir)s/
 ''', locals ())
-
-	def do_configure (self):
 		targetpackage.Target_package.configure (self)
 
 	# FIXME: shared for all CVS packages
@@ -694,7 +695,8 @@
 		self.file_sub ([('<malloc.h>', '<stdlib.h>'),
 				
 				##ugh.
-				('#define _XOPEN_SOURCE', '#define _XOPEN_SOURCE\n#define _SC_PAGESIZE		47\n')
+				('#ifdef G_OS_WIN32',
+				 '#ifdef G_OS_WIN32\n#define _SC_PAGESIZE		47\n')
 				],
 			       '%(srcdir)s/glib/gslice.c')
 
@@ -1289,9 +1291,9 @@
 		Ghostscript (settings).with (version="8.15.1", mirror=download.cups,
 						     format='bz2', depends=['libjpeg', 'libpng']),
 		LilyPond__darwin (settings).with (version=settings.lilypond_branch, mirror=cvs.gnu, track_development=True,
-						  depends=['pango', 'guile', 'gettext', 'ghostscript', 'fondu']
+						  depends=['pango', 'guile', 'gettext', 'ghostscript', 'fondu', 'osx-lilypad']
 						  ),
-		OSX_Lilypad (settings).with (version="0.0", mirror=download.hw, depends=['lilypond']),
+		OSX_Lilypad (settings).with (version="0.0", mirror=download.hw, depends=[]),
 	),
 	'mingw': [
 		Regex (settings).with (version='2.3.90-1', mirror=download.lp, format='bz2',