Mercurial > gub

changeset 6404:e84fa9bddd3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #15 from trueroad/lilypond-issue4347 Delete {mingw|cygwin}::lilypond LDFLAGS libpython for lilypond's issue4347
author PhilHolmes <PhilEHolmes@gmail.com>
date Wed, 22 Apr 2015 15:53:41 +0100
parents 84fb766d47f0 (current diff) ab0881f04ce0 (diff)
children 743ca8729076 0f55d81e0139
files
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cygwin/lilypond.py	Tue Apr 14 15:29:42 2015 +0100
+++ b/gub/specs/cygwin/lilypond.py	Wed Apr 22 15:53:41 2015 +0100
@@ -24,10 +24,9 @@
                                                ]
     configure_flags = (lilypond.LilyPond.configure_flags
                        .replace ('--enable-relocation', '--disable-relocation'))
-    python_lib = '%(system_prefix)s/bin/libpython*.dll'
     LDFLAGS = '-L%(system_prefix)s/lib -L%(system_prefix)s/bin -L%(system_prefix)s/lib/w32api'
     make_flags = (lilypond.LilyPond.make_flags
-                  + ' LDFLAGS="%(LDFLAGS)s %(python_lib)s"')
+                  + ' LDFLAGS="%(LDFLAGS)s"')
 #    branch = 'stable/2.12'
     def __init__ (self, settings, source):
         lilypond.LilyPond.__init__ (self, settings, source)
--- a/gub/specs/lilypond.py	Tue Apr 14 15:29:42 2015 +0100
+++ b/gub/specs/lilypond.py	Wed Apr 22 15:53:41 2015 +0100
@@ -61,7 +61,7 @@
                        + ' --enable-relocation'
                        + ' --enable-rpath'
                        + ' --disable-documentation'
-                       + ' --with-ncsb-dir=%(system_prefix)s/share/fonts/default/Type1'
+                       + ' --with-fonts-dir=%(system_prefix)s/share/fonts/default/Type1'
                        )
     make_flags = ' TARGET_PYTHON=/usr/bin/python'
 
@@ -173,9 +173,6 @@
             'tools::icoutils',
             'mingw-w64-runtime-winpthread-dll',
             ]
-    python_lib = '%(system_prefix)s/bin/libpython*.dll'
-    make_flags = (LilyPond.make_flags
-                  + ' LDFLAGS="%(python_lib)s"'  % locals ())
     # ugh Python hack: C&P Cygwin
     def compile (self):
         self.system ('''