Mercurial > gub
changeset 6040:46809fbcb988
Cygwin: First GUB3 release: guile-1.8.7.
* install libmpfr-dev
* gub cygwin::guile
* rm target/cygwin/packages/guile-config*
* cygwin-packager guile
* scp -prv uploads/cygwin/setup.ini uploads/cygwin/release lilypond.org:cygwin/
* gen-announce.sh guile > guile.mess
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 16 Nov 2010 17:04:07 +0100 |
| parents | e11adc80a304 |
| children | 4db4ae9334ae |
| files | gub/cygwin.py gub/specs/cygwin/guile.py gub/specs/cygwin/lilypond.py patches/guile-1.8.5-export-symbols.patch schikkers-list.make sourcefiles/guile.changelog |
| diffstat | 6 files changed, 25 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/cygwin.py Fri Nov 12 12:51:06 2010 +0100 +++ b/gub/cygwin.py Tue Nov 16 17:04:07 2010 +0100 @@ -320,7 +320,7 @@ 'freetype-devel' : ['libfreetype-devel'], 'gettext' : ['libintl8', 'libintl3'], 'gmp-devel': ['gmp'], - 'guile' : ['libguile17', 'libguile12'], # ugh '-devel' gets stripped +# 'guile' : ['libguile17', 'libguile12'], # ugh '-devel' gets stripped 'guile-runtime' : ['libguile17', 'libguile12'], 'libfontconfig': ['libfontconfig-devel'], 'libfontconfig1': ['libfontconfig-devel'],
--- a/gub/specs/cygwin/guile.py Fri Nov 12 12:51:06 2010 +0100 +++ b/gub/specs/cygwin/guile.py Tue Nov 16 17:04:07 2010 +0100 @@ -4,7 +4,10 @@ from gub.specs import guile class Guile (guile.Guile): - patches = guile.Guile.patches + ['guile-1.8.7-no-complex.patch'] + patches = guile.Guile.patches + [ + 'guile-1.8.7-no-complex.patch', + 'guile-1.8.5-export-symbols.patch', + ] config_cache_overrides = guile.Guile.config_cache_overrides + ''' guile_cv_func_usleep_declared=${guile_cv_func_usleep_declared=yes} guile_cv_exeext=${guile_cv_exeext=} @@ -14,15 +17,11 @@ + misc.join_lines (''' CFLAGS='-DHAVE_CONFIG_H=1 -I%(builddir)s' ''')) - dependencies = gup.gub_to_distro_deps (lilypond.LilyPond.dependencies, + dependencies = gup.gub_to_distro_deps (guile.Guile.dependencies, cygwin.gub_to_distro_dict) EXE = '.exe' def category_dict (self): return {'': 'Interpreters'} - def XXXconfigure (self): - self.file_sub ([('''^#(LIBOBJS=".*fileblocks.*)''', r'\1')], - '%(srcdir)s/configure') - guile.Guile.configure (self) # C&P from guile.Guile__mingw def compile (self): ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage?
--- a/gub/specs/cygwin/lilypond.py Fri Nov 12 12:51:06 2010 +0100 +++ b/gub/specs/cygwin/lilypond.py Tue Nov 16 17:04:07 2010 +0100 @@ -9,6 +9,7 @@ LilyPond lets you create music notation. It produces beautiful sheet music from a high-level description file.''' subpackage_names = ['doc', ''] + source = 'http://lilypond.org/download/source/v2.13/lilypond-2.13.39.tar.gz' dependencies = gup.gub_to_distro_deps (lilypond.LilyPond.dependencies, cygwin.gub_to_distro_dict) + [ 'tools::imagemagick',
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-1.8.5-export-symbols.patch Tue Nov 16 17:04:07 2010 +0100 @@ -0,0 +1,10 @@ +--- guile-1.8.5/libguile/gc.h 2008-05-04 16:39:48.000000000 -0500 ++++ guile-1.8.5/libguile/gc.h 2008-05-26 08:46:31.453125000 -0500 +@@ -242,6 +242,7 @@ + #endif + + SCM_API scm_i_pthread_mutex_t scm_i_gc_admin_mutex; ++SCM_API int scm_i_terminating; + + #define scm_gc_running_p (SCM_I_CURRENT_THREAD->gc_running_p) + SCM_API scm_i_pthread_mutex_t scm_i_sweep_mutex;
--- a/schikkers-list.make Fri Nov 12 12:51:06 2010 +0100 +++ b/schikkers-list.make Tue Nov 16 17:04:07 2010 +0100 @@ -57,7 +57,7 @@ bin/gub tools::nsis update-versions: - python gub/versiondb.py --no-sources --version-db=versiondb/schikkers-list.versions --download --platforms="mingw" --url=http://lilypond.org/blog/janneke/software/schikkers-list + python gub/versiondb.py --no-sources --version-db=versiondb/schikkers-list.versions --download --platforms="mingw" --url=http://lilypond.org/schikkers-list/download/ print-success: @echo "success!!"
--- a/sourcefiles/guile.changelog Fri Nov 12 12:51:06 2010 +0100 +++ b/sourcefiles/guile.changelog Tue Nov 16 17:04:07 2010 +0100 @@ -1,3 +1,10 @@ +guile (1.8.7-1) unstable; urgency=low + + * New upstream release. + * Add int scm_i_terminating export, thanks Yaakov. + + -- Jan Nieuwenhuizen <janneke@gnu.org> Mon, 15 Nov 15:49:58 2010 +0100 + guile (1.8.5-1) unstable; urgency=low * New upstream release.