Mercurial > gub
changeset 981:96d089086c3b
Revert to system FlexLexer.h detection.
| author | janneke <janneke@gnu.org> |
|---|---|
| date | Thu, 12 Jan 2006 22:37:09 +0100 |
| parents | 247afd2b2c6f |
| children | f721d7074850 |
| files | specs/framework.py |
| diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/specs/framework.py Fri Jan 13 01:31:00 2006 +0100 +++ b/specs/framework.py Thu Jan 12 22:37:09 2006 +0100 @@ -326,6 +326,12 @@ def configure (self): self.autoupdate () + flex = self.read_pipe ('type flex') + flex_include_dir = os.path.split (flex)[0] + "/../include" + gub.Package.system (self, ''' +mkdir -p %(builddir)s +cp %(flex_include_dir)s/FlexLexer.h %(builddir)s/ +''', locals ()) def do_configure (self): targetpackage.Target_package.configure (self) @@ -392,13 +398,6 @@ self.do_configure () class LilyPond__mingw (LilyPond): - def __init__ (self, settings): - LilyPond.__init__ (self, settings) - - # FIXME: should add to CPPFLAGS... - self.target_gcc_flags = '-mms-bitfields' - - def patch (self): # FIXME: for our gcc-3.4.5 cross compiler in the mingw # environment, THIS is a magic word. @@ -407,11 +406,15 @@ def do_configure (self): LilyPond.do_configure (self) + # Configure (compile) without -mwindows for console + self.target_gcc_flags = '-mms-bitfields' self.config_cache () cmd = self.configure_command () \ + ' --enable-config=console' self.system ('''cd %(builddir)s && %(cmd)s''', locals ()) + # Do not override flags while running make lateron + self.target_gcc_flags = '' def compile_command (self): python_lib = "%(system_root)s/usr/bin/libpython%(python_version)s.dll"