Mercurial > gub

comparison gub/specs/guile.py @ 6499:f6954111c9e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guile: bump to 2.0.0.1. Fixes running schikkers-list.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 16 Mar 2011 22:41:39 +0100
parents bb93d191eb53
children 2c57f92179f2
comparison
equal deleted inserted replaced
6498:d4c34a6c5505 6499:f6954111c9e3
9 from gub import tools 9 from gub import tools
10 from gub import tools32 10 from gub import tools32
11 11
12 class Guile (target.AutoBuild): 12 class Guile (target.AutoBuild):
13 # source = 'git://git.sv.gnu.org/guile.git&branch=branch_release-1-8&revision=bba579611b3671c7e4c1515b100f01c048a07935' 13 # source = 'git://git.sv.gnu.org/guile.git&branch=branch_release-1-8&revision=bba579611b3671c7e4c1515b100f01c048a07935'
14 source = 'http://ftp.gnu.org/pub/gnu/guile/guile-1.8.7.tar.gz' 14 source = 'http://ftp.gnu.org/gnu/guile/guile-2.0.0.1.tar.gz'
15 source = 'http://alpha.gnu.org/gnu/guile/guile-1.9.15.tar.gz'
16 source = 'http://ftp.gnu.org/gnu/guile/guile-2.0.0.tar.gz'
17 patches = [ 15 patches = [
18 #'guile-reloc-1.8.6.patch',
19 'guile-1.9.14-reloc.patch', 16 'guile-1.9.14-reloc.patch',
20 #'guile-cexp.patch',
21 'guile-1.8.6-test-use-srfi.patch', 17 'guile-1.8.6-test-use-srfi.patch',
22 #'guile-1.8.7-doc-snarfing.patch',
23 ##'guile-1.9.14-configure-cross.patch',
24 'guile-2.0.0-configure-cross.patch', 18 'guile-2.0.0-configure-cross.patch',
25 'guile-1.9.15-cross.patch', 19 'guile-2.0.0.1-cross.patch',
26 'guile-1.9.14-gnulib-libunistring.patch', 20 'guile-1.9.14-gnulib-libunistring.patch',
27 #'guile-1.9.14-gnulib-libunistring-retooled.patch',
28 ] 21 ]
29 force_autoupdate = True 22 force_autoupdate = True
30 dependencies = [ 23 dependencies = [
31 'gettext-devel', 24 'gettext-devel',
32 'gmp-devel', 25 'gmp-devel',
106 ''', "%(srcdir)s/pre-inst-guile.in") 99 ''', "%(srcdir)s/pre-inst-guile.in")
107 #self.autopatch () 100 #self.autopatch ()
108 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4') 101 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4')
109 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') 102 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')
110 target.AutoBuild.patch (self) 103 target.AutoBuild.patch (self)
111 self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/putenv.c')
112 self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/stdlib.in.h')
113 def autoupdate (self): 104 def autoupdate (self):
114 self.system ('cd %(srcdir)s && autoreconf') 105 self.system ('cd %(srcdir)s && ./autogen.sh')
115 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs': 106 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs':
116 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs' 107 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs'
117 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure') 108 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure')
118 self.file_sub ([('cross_compiling=(maybe|no|yes)', 109 self.file_sub ([('cross_compiling=(maybe|no|yes)',
119 'cross_compiling=yes')], '%(srcdir)s/configure') 110 'cross_compiling=yes')], '%(srcdir)s/configure')
217 for libtool in ['%(builddir)s/libtool']: # readline patched-out: '%(builddir)s/guile-readline/libtool']: 208 for libtool in ['%(builddir)s/libtool']: # readline patched-out: '%(builddir)s/guile-readline/libtool']:
218 self.file_sub ([('-mwindows', '')], libtool) 209 self.file_sub ([('-mwindows', '')], libtool)
219 210
220 gnulib_modules = (Guile.gnulib_modules 211 gnulib_modules = (Guile.gnulib_modules
221 + 'accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket ') 212 + 'accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket ')
213 def patch (self):
214 Guile.patch (self)
215 self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/putenv.c')
216 self.file_sub ([('putenv', 'gnulib_putenv')], '%(srcdir)s/lib/stdlib.in.h')
222 def compile (self): 217 def compile (self):
223 ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage? 218 ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage?
224 self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''') 219 self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''')
225 self.system ('cd %(builddir)s/libguile && cp guile_filter_doc_snarfage.exe guile_filter_doc_snarfage') 220 self.system ('cd %(builddir)s/libguile && cp guile_filter_doc_snarfage.exe guile_filter_doc_snarfage')
226 Guile.compile (self) 221 Guile.compile (self)
268 compile_flags_native = (Guile.compile_flags_native + 263 compile_flags_native = (Guile.compile_flags_native +
269 'CPATH="%(srcdir)s:%(builddir)s:%(system_prefix)s/include" ') 264 'CPATH="%(srcdir)s:%(builddir)s:%(system_prefix)s/include" ')
270 265
271 class Guile__tools (tools.AutoBuild, Guile): 266 class Guile__tools (tools.AutoBuild, Guile):
272 patches = [ 267 patches = [
273 'guile-2.0.0-testsuite.patch', 268 'guile-2.0.0.1-testsuite.patch',
274 'guile-2.0.0-mingw-compile-binary.patch', 269 'guile-2.0.0-mingw-compile-binary.patch',
275 ] 270 ]
276 dependencies = (Guile.dependencies 271 dependencies = (Guile.dependencies
277 + [ 272 + [
278 'autoconf', 273 'autoconf',
306 def patch (self): 301 def patch (self):
307 tools.AutoBuild.patch (self) 302 tools.AutoBuild.patch (self)
308 #Guile.autopatch (self) 303 #Guile.autopatch (self)
309 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4') 304 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4')
310 def autoupdate (self): 305 def autoupdate (self):
311 self.system ('cd %(srcdir)s && autoreconf') 306 self.system ('cd %(srcdir)s && ./autogen.sh')
312 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs': 307 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs':
313 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs' 308 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs'
314 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure') 309 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure')
315 def install (self): 310 def install (self):
316 tools.AutoBuild.install (self) 311 tools.AutoBuild.install (self)