# HG changeset patch # User Jan Nieuwenhuizen # Date 1300311699 -3600 # Node ID f6954111c9e3aba06291dcf5a936c6527f69cf09 # Parent d4c34a6c550506bd1122d864400a07b48b234991 guile: bump to 2.0.0.1. Fixes running schikkers-list. diff -r d4c34a6c5505 -r f6954111c9e3 gub/specs/guile.py --- a/gub/specs/guile.py Tue Mar 15 21:04:50 2011 +0100 +++ b/gub/specs/guile.py Wed Mar 16 22:41:39 2011 +0100 @@ -11,20 +11,13 @@ class Guile (target.AutoBuild): # source = 'git://git.sv.gnu.org/guile.git&branch=branch_release-1-8&revision=bba579611b3671c7e4c1515b100f01c048a07935' - source = 'http://ftp.gnu.org/pub/gnu/guile/guile-1.8.7.tar.gz' - source = 'http://alpha.gnu.org/gnu/guile/guile-1.9.15.tar.gz' - source = 'http://ftp.gnu.org/gnu/guile/guile-2.0.0.tar.gz' + source = 'http://ftp.gnu.org/gnu/guile/guile-2.0.0.1.tar.gz' patches = [ - #'guile-reloc-1.8.6.patch', 'guile-1.9.14-reloc.patch', - #'guile-cexp.patch', 'guile-1.8.6-test-use-srfi.patch', - #'guile-1.8.7-doc-snarfing.patch', - ##'guile-1.9.14-configure-cross.patch', 'guile-2.0.0-configure-cross.patch', - 'guile-1.9.15-cross.patch', + 'guile-2.0.0.1-cross.patch', 'guile-1.9.14-gnulib-libunistring.patch', - #'guile-1.9.14-gnulib-libunistring-retooled.patch', ] force_autoupdate = True dependencies = [ @@ -108,10 +101,8 @@ self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4') self.system ('%(tools_prefix)s/share/gnulib/gnulib-tool --import --dir=%(srcdir)s --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --libtool --macro-prefix=gl --no-vc-files %(gnulib_modules)s') target.AutoBuild.patch (self) - self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/putenv.c') - self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/stdlib.in.h') def autoupdate (self): - self.system ('cd %(srcdir)s && autoreconf') + self.system ('cd %(srcdir)s && ./autogen.sh') # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs': # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs' self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure') @@ -219,6 +210,10 @@ gnulib_modules = (Guile.gnulib_modules + 'accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket ') + def patch (self): + Guile.patch (self) + self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/putenv.c') + self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/stdlib.in.h') def compile (self): ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage? self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''') @@ -270,7 +265,7 @@ class Guile__tools (tools.AutoBuild, Guile): patches = [ - 'guile-2.0.0-testsuite.patch', + 'guile-2.0.0.1-testsuite.patch', 'guile-2.0.0-mingw-compile-binary.patch', ] dependencies = (Guile.dependencies @@ -308,7 +303,7 @@ #Guile.autopatch (self) self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4') def autoupdate (self): - self.system ('cd %(srcdir)s && autoreconf') + self.system ('cd %(srcdir)s && ./autogen.sh') # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs': # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs' self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure') diff -r d4c34a6c5505 -r f6954111c9e3 patches/guile-2.0.0.1-cross.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-2.0.0.1-cross.patch Wed Mar 16 22:41:39 2011 +0100 @@ -0,0 +1,22 @@ +--- guile-2.0.0.1/Makefile.am~ 2011-03-15 22:53:10.506232196 +0100 ++++ guile-2.0.0.1/Makefile.am 2011-03-15 23:01:28.238205807 +0100 +@@ -33,8 +33,6 @@ SUBDIRS = \ + guile-readline \ + examples \ + emacs \ +- test-suite \ +- benchmark-suite \ + gc-benchmarks \ + am \ + doc +--- guile-1.9.14/meta/guile-2.0.pc.in~ 2010-12-14 19:15:17.000000000 +0100 ++++ guile-1.9.14/meta/guile-2.0.pc.in 2011-01-31 13:39:29.453612101 +0100 +@@ -5,7 +5,7 @@ includedir=@includedir@ + datarootdir=@datarootdir@ + datadir=@datadir@ + pkgdatadir=@datadir@/guile +-pkgincludedir=@includedir@/guile ++pkgincludedir=${includedir}/guile + + sitedir=@sitedir@ + extensiondir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions diff -r d4c34a6c5505 -r f6954111c9e3 patches/guile-2.0.0.1-testsuite.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-2.0.0.1-testsuite.patch Wed Mar 16 22:41:39 2011 +0100 @@ -0,0 +1,23 @@ +In guile 2.0, testsuite fails with + +In file included from ../../libguile/scmconfig.h:27, + from /home/janneke/vc/gub/target/tools/src/guile-2.0.0/libguile/__scm.h:54, + from /home/janneke/vc/gub/target/tools/src/guile-2.0.0/libguile.h:31, + from /home/janneke/vc/gub/target/tools/src/guile-2.0.0/test-suite/standalone/test-asmobs-lib.c:23: +../../lib/time.h:469: error: expected ';', ',' or ')' before '__timer' +../../lib/time.h:491: error: expected ';', ',' or ')' before '__timer' + + +$ diff -purN guile-2.0.0.1/Makefile.am~ guile-2.0.0.1/Makefile.am +--- guile-2.0.0.1/Makefile.am~ 2011-03-16 19:14:29.724924881 +0100 ++++ guile-2.0.0.1/Makefile.am 2011-03-16 19:15:17.970123750 +0100 +@@ -33,8 +33,6 @@ SUBDIRS = \ + guile-readline \ + examples \ + emacs \ +- test-suite \ +- benchmark-suite \ + gc-benchmarks \ + am \ + doc +[1]19:15:35 janneke@vuurvlieg:~/vc/gub/target/tools/src