--- a/bin/cygwin-packager	Tue Nov 23 11:33:34 2010 +0100
+++ b/bin/cygwin-packager	Fri Dec 03 22:39:28 2010 +0100
@@ -77,6 +77,7 @@
         p = self.package_manager.get_all_packages ()[0]
         if not self.settings.build:
             self.settings.build = self.build_number (p)
+        self.settings.build = '2'
 
     def build_number (self, package):
         from gub import versiondb

--- a/gub/specs/cygwin/guile.py	Tue Nov 23 11:33:34 2010 +0100
+++ b/gub/specs/cygwin/guile.py	Fri Dec 03 22:39:28 2010 +0100
@@ -15,11 +15,16 @@
 '''
     configure_variables = (guile.Guile.configure_variables
                 + misc.join_lines ('''
-CFLAGS='-DHAVE_CONFIG_H=1 -I%(builddir)s'
+CFLAGS='-O2 -DHAVE_CONFIG_H=1 -I%(builddir)s'
 '''))
     dependencies = gup.gub_to_distro_deps (guile.Guile.dependencies,
                                            cygwin.gub_to_distro_dict)
+    build_number = '2'
     EXE = '.exe'
+    install_command = guile.Guile.install_command + ' install-info'
+    def autopatch (self):
+        # we want info docs in cygwin
+        pass
     def category_dict (self):
         return {'': 'Interpreters'}
     # C&P from guile.Guile__mingw

--- a/gub/specs/guile.py	Tue Nov 23 11:33:34 2010 +0100
+++ b/gub/specs/guile.py	Fri Dec 03 22:39:28 2010 +0100
@@ -71,7 +71,7 @@
         self.dump ('''#!/bin/sh
 exec %(tools_prefix)s/bin/guile "$@"
 ''', "%(srcdir)s/pre-inst-guile.in")
-        self.autopatch ()
+        #self.autopatch ()
         target.AutoBuild.patch (self)
     def autopatch (self):
         self.file_sub ([(r'AC_CONFIG_SUBDIRS\(guile-readline\)', '')],
@@ -135,7 +135,7 @@
     configure_variables = (Guile.configure_variables
                            .replace ("':'", "';'")
                 + misc.join_lines ('''
-CFLAGS='-DHAVE_CONFIG_H=1 -I%(builddir)s'
+CFLAGS='-O2 -DHAVE_CONFIG_H=1 -I%(builddir)s'
 '''))
     config_cache_overrides = Guile.config_cache_overrides + '''
 scm_cv_struct_timespec=${scm_cv_struct_timespec=no}
@@ -209,7 +209,7 @@
     # Great idea, let's re-check!  You never know... :-)
     compile_flags_native = misc.join_lines ('''
 LD_LIBRARY_PATH=%(system_prefix)s/lib
-CFLAGS='-I%(system_prefix)s/include'
+CFLAGS='-O2 -I%(system_prefix)s/include'
 LDFLAGS='-L%(system_prefix)s/lib %(rpath)s'
 ''')
     configure_command = ('LD_LIBRARY_PATH=%(system_prefix)s/lib:${LD_LIBRARY_PATH-/foe} '
@@ -223,7 +223,7 @@
                 + Guile.compile_command)
     def patch (self):
         tools.AutoBuild.patch (self)
-        Guile.autopatch (self)
+        #Guile.autopatch (self)
     def install (self):
         tools.AutoBuild.install (self)
         self.system ('cd %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/bin && cp guile guile-1.8')

--- a/gub/specs/lilypondcairo.py	Tue Nov 23 11:33:34 2010 +0100
+++ b/gub/specs/lilypondcairo.py	Fri Dec 03 22:39:28 2010 +0100
@@ -11,6 +11,7 @@
                     for x in lilypond.Lilypond.dependencies]
     patches = [
         '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch',
+        '0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch',
         ]
     def get_conflict_dict (self):
         return {'': ['lilypond']}
@@ -21,6 +22,7 @@
                 for x in lilypond.Lilypond__mingw.dependencies]
     patches = [
         '0003-Start-OTF-font-from-E800-avoids-hardcoded-linux-unic.patch',
+        '0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch',
         ]
     def get_conflict_dict (self):
         return {'': ['lilypond']}

--- a/sourcefiles/gub.license	Tue Nov 23 11:33:34 2010 +0100
+++ b/sourcefiles/gub.license	Fri Dec 03 22:39:28 2010 +0100
@@ -1,21 +1,16 @@
 
 This installer contains an aggregration of different free software
-packages under different licenses. The licenses of these packages are
-in this directory.
+packages under different licenses: LGPL, GPL, BSD and BSD-like
+(without advertising clause) and MIT-like.  The licenses of these
+packages are in this directory.
 
 The source code for the individual packages can be found at
 
-  http://lilypond.org/~hanwen/gub/downloads/
-
-
-
+    http://lilypond.org/gub/download
 
-This installer was made with GUB, the Grand Unified Builder for the
-LilyPond project. GUB is released under the GNU General Public
-License.  More information on GUB, including installation
-instructions, can be found at:
+This installer was made with GUB, the Grand Unified Builder, a mini
+source-based distribution and packaging system.  GUB is released under
+the GNU General Public License.  More information on GUB, including
+installation instructions, can be found at
 
-  http://lilypond.org/~hanwen/gub/READ-ME
-
-
-
+    http://lilypond.org/gub

--- a/sourcefiles/guile.changelog	Tue Nov 23 11:33:34 2010 +0100
+++ b/sourcefiles/guile.changelog	Fri Dec 03 22:39:28 2010 +0100
@@ -1,3 +1,10 @@
+guile (1.8.7-2) unstable; urgency=low
+
+  * Do not strip doc from build.
+  * Build using -O2.  Fixes stack overflow with default stack size.
+	
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu, 25 Nov 10:38:25 2010 +0100
+
 guile (1.8.7-1) unstable; urgency=low
 
   * New upstream release.