changeset 6262:e72f95510101

Fix lilypond.exe crash mingw runtime update
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Sat, 01 Nov 2014 19:16:50 +0900
parents 5fe88df43374
children e1f776effeb4
files gub/gup.py gub/specs/cross/gcc.py gub/specs/mingw-runtime.py gub/specs/mingwrt-dev.py gub/specs/mingwrt-dll.py
diffstat 5 files changed, 24 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/gub/gup.py	Sat Nov 01 15:07:46 2014 +0900
+++ b/gub/gup.py	Sat Nov 01 19:16:50 2014 +0900
@@ -427,7 +427,7 @@
     # FIXME: rename packages, fragile
     if [True for x in [
             'freebsd-runtime',
-            'mingw-runtime',
+            'mingwrt-dev',
             'lilypond-doc',
             'cygwin::',
             ] if x in name]:
--- a/gub/specs/cross/gcc.py	Sat Nov 01 15:07:46 2014 +0900
+++ b/gub/specs/cross/gcc.py	Sat Nov 01 19:16:50 2014 +0900
@@ -80,7 +80,7 @@
 class Gcc__mingw (Gcc):
     source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2'
     dependencies = (Gcc.dependencies
-                + ['mingw-runtime', 'w32api']
+                + ['mingwrt-dev', 'mingwrt-dll', 'w32api']
                 + ['tools::libtool'])
     def patch (self):
         Gcc.patch (self)
--- a/gub/specs/mingw-runtime.py	Sat Nov 01 15:07:46 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-from gub import build
-
-class Mingw_runtime (build.BinaryBuild, build.SdkBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.14.tar.gz&strip=0'
-    def install (self):
-        self.system ('''
-mkdir -p %(install_prefix)s/share
-cd %(srcdir)s && tar -C %(srcdir)s/ -cf - . | tar -C %(install_prefix)s -xf -
-mkdir -p %(install_prefix)s/include/sys
-#cp -p %(sourcefiledir)s/mingw-headers/wait.h %(install_prefix)s/include/sys
-mv %(install_prefix)s/doc %(install_root)s/share
-''', locals ())
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mingwrt-dev.py	Sat Nov 01 19:16:50 2014 +0900
@@ -0,0 +1,12 @@
+from gub import build
+
+class Mingwrt_dev (build.BinaryBuild, build.SdkBuild):
+    source = 'http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/mingwrt-3.20-mingw32-dev.tar.gz&strip=0'
+    def install (self):
+        self.system ('''
+mkdir -p %(install_prefix)s/share
+cd %(srcdir)s && tar -C %(srcdir)s/ -cf - . | tar -C %(install_prefix)s -xf -
+mkdir -p %(install_prefix)s/include/sys
+#cp -p %(sourcefiledir)s/mingw-headers/wait.h %(install_prefix)s/include/sys
+mv %(install_prefix)s/doc %(install_root)s/share
+''', locals ())
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mingwrt-dll.py	Sat Nov 01 19:16:50 2014 +0900
@@ -0,0 +1,10 @@
+from gub import build
+
+class Mingwrt_dll (build.BinaryBuild, build.SdkBuild):
+    source = 'http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/mingwrt-3.20-mingw32-dll.tar.gz&strip=0'
+    def install (self):
+        self.system ('''
+rm -fr %(srcdir)s/doc/
+mkdir -p %(install_prefix)s/bin/
+cd %(srcdir)s/bin/ && tar -C %(srcdir)s/bin/ -cf - . | tar -C %(install_prefix)s/bin/ -xf -
+''', locals ())