Mercurial > gub

changeset 6451:ff3d95a637a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw::lilypond: also link with libgc. Fixes build.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sun, 30 Jan 2011 15:09:27 +0100
parents 19fc7fdaa53a
children d0006ae646bd
files gub/specs/lilypond.py
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/lilypond.py	Sun Jan 30 15:09:01 2011 +0100
+++ b/gub/specs/lilypond.py	Sun Jan 30 15:09:27 2011 +0100
@@ -48,8 +48,8 @@
         'tools::texinfo',
         #'tools::texlive',
 
-        'system::mf', 
-        'system::mpost', 
+        'system::mf',
+        'system::mpost',
         ]
     if 'stat' in misc.librestrict ():
         dependencies = [x for x in dependencies
@@ -144,7 +144,7 @@
                         ('^([$][{]?srcdir[}]?/.*$)', r'(set +eux; \1) || exit 1'),
                         ], '%(srcdir)s/' + i)
     def autoupdate (self):
-        self.system ('cd %(srcdir)s && ./smart-autogen.sh --noconfigure') 
+        self.system ('cd %(srcdir)s && ./smart-autogen.sh --noconfigure')
 
 LilyPond = LilyPond__smart
 
@@ -156,8 +156,8 @@
     dependencies = [x for x in LilyPond.dependencies
                 if x != 'python-devel']
     def configure (self):
-        self.system ('mkdir -p %(builddir)s || true') 
-        self.system ('touch %(builddir)s/Python.h') 
+        self.system ('mkdir -p %(builddir)s || true')
+        self.system ('touch %(builddir)s/Python.h')
         LilyPond.configure (self)
         self.dump ('''
 all:
@@ -166,13 +166,16 @@
 install:
         -mkdir -p $(DESTDIR)%(prefix_dir)s/lib/lilypond/%(version)s
 ''', '%(builddir)s/python/GNUmakefile')
-        
+
 class LilyPond__mingw (LilyPond):
     dependencies = LilyPond.dependencies + [
             'tools::imagemagick',
             'tools::icoutils',
             'mingw-w64-runtime-winpthread-dll',
             ]
+    python_lib = '%(system_prefix)s/bin/libpython*.dll'
+    make_flags = (LilyPond.make_flags
+                  + ' LDFLAGS="%(python_lib)s -lgc"'  % locals ())
     # ugh Python hack: C&P Cygwin
     def compile (self):
         self.system ('''
@@ -181,7 +184,7 @@
         LilyPond.compile (self)
         self.system ('''
 cd %(builddir)s/lily && mv out/lilypond out/lilypond-console
-cd %(builddir)s/lily && make MODULE_LDFLAGS='-mwindows'
+cd %(builddir)s/lily && make MODULE_LDFLAGS='-mwindows' LDFLAGS=-lgc
 cd %(builddir)s/lily && mv out/lilypond out/lilypond-windows
 cd %(builddir)s/lily && touch out/lilypond
 ''')
@@ -212,7 +215,7 @@
         bat = r'''@echo off
 "@INSTDIR@\usr\bin\lilypond-windows.exe" -dgui %1 %2 %3 %4 %5 %6 %7 %8 %9
 '''.replace ('%', '%%').replace ('\n', '\r\n')
-            
+
         self.dump (bat, '%(install_prefix)s/bin/lilypond-windows.bat.in')
 
 class LilyPond__debian (LilyPond):