Path guile on mingw

Now that LilyPond builds with -std=c++11, the compiler headers try to use ::copysign.
gperciva · Mar 2, 2020 · 6240dc8 · 6240dc8
1 parent f1469d0
commit 6240dc8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/gub/specs/guile.py b/gub/specs/guile.py
@@ -107,6 +107,7 @@ def install (self):
         self.system ('cd %(install_prefix)s%(cross_dir)s/bin && cp -pv %(target_architecture)s-guile-config guile-config')
 
 class Guile__mingw (Guile):
+    patches = Guile.patches + ['guile-1.8.7-mingw-copysign.patch']
     def __init__ (self, settings, source):
         Guile.__init__ (self, settings, source)
         # Configure (compile) without -mwindows for console

diff --git a/patches/guile-1.8.7-mingw-copysign.patch b/patches/guile-1.8.7-mingw-copysign.patch
@@ -0,0 +1,10 @@
+--- guile-1.8.7/libguile/numbers.h	2020-03-02 15:43:11.673024370 +0100
++++ guile-1.8.7/libguile/numbers.h	2020-03-02 15:43:27.876044196 +0100
+@@ -91,7 +91,6 @@
+ # ifndef GO32
+ #  include <float.h>
+ #  ifdef __MINGW32__
+-#   define copysign _copysign
+ #   define finite _finite
+ #  endif /* __MINGW32__ */
+ # endif /* ndef GO32 */