Merge pull request #15 from trueroad/lilypond-issue4347

Delete {mingw|cygwin}::lilypond LDFLAGS libpython for lilypond's issue4347
gperciva · Apr 22, 2015 · 775b850 · 775b850
2 parents 269ac49 + f0c7b8f
commit 775b850
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/gub/specs/cygwin/lilypond.py b/gub/specs/cygwin/lilypond.py
@@ -24,10 +24,9 @@ class LilyPond (lilypond.LilyPond):
                                                ]
     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)

diff --git a/gub/specs/lilypond.py b/gub/specs/lilypond.py
@@ -61,7 +61,7 @@ class LilyPond__simple (target.AutoBuild):
                        + ' --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 @@ class LilyPond__mingw (LilyPond):
             '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 ('''