Mercurial > gub

comparison gub/specs/guile.py @ 6471:834c939b7f86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guile: always retool and junk putenv.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 02 Feb 2011 18:23:54 +0100
parents f1b28c608b3a
children 3f3bf4ecad6e
comparison
equal deleted inserted replaced
6470:f1b28c608b3a 6471:834c939b7f86
19 #'guile-cexp.patch', 19 #'guile-cexp.patch',
20 'guile-1.8.6-test-use-srfi.patch', 20 'guile-1.8.6-test-use-srfi.patch',
21 #'guile-1.8.7-doc-snarfing.patch', 21 #'guile-1.8.7-doc-snarfing.patch',
22 'guile-1.9.14-configure-cross.patch', 22 'guile-1.9.14-configure-cross.patch',
23 'guile-1.9.14-cross.patch', 23 'guile-1.9.14-cross.patch',
24 #'guile-1.9.14-gnulib-libunistring.patch',
25 'guile-1.9.14-gnulib-libunistring-retooled.patch',
24 ] 26 ]
25 force_autoupdate = True 27 force_autoupdate = True
26 dependencies = [ 28 dependencies = [
27 'gettext-devel', 29 'gettext-devel',
28 'gmp-devel', 30 'gmp-devel',
89 if isinstance (source, repository.Git): 91 if isinstance (source, repository.Git):
90 ##source.version = lambda: '1.8.6' 92 ##source.version = lambda: '1.8.6'
91 source.version = misc.bind_method (Guile.version_from_VERSION, 93 source.version = misc.bind_method (Guile.version_from_VERSION,
92 source) 94 source)
93 self.so_version = '17' 95 self.so_version = '17'
96 # REMOVE putenv!
97 gnulib_modules = 'alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile nproc stat-time stdlib strcase strftime striconveh string sys_stat verify version-etc-fsf vsnprintf warnings '
94 def patch (self): 98 def patch (self):
95 self.dump ('''#!/bin/sh 99 self.dump ('''#!/bin/sh
96 exec %(tools_archmatch_prefix)s/bin/guile "$@" 100 exec %(tools_archmatch_prefix)s/bin/guile "$@"
97 ''', "%(srcdir)s/pre-inst-guile.in") 101 ''', "%(srcdir)s/pre-inst-guile.in")
98 #self.autopatch () 102 #self.autopatch ()
103 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4')
104 self.system ('cd %(srcdir)s && gnulib-tool --import --dir=. --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')
99 target.AutoBuild.patch (self) 105 target.AutoBuild.patch (self)
100 self.system ('cp -pv %(sourcefiledir)s/fcntl-o.m4 %(srcdir)s/m4') 106 ##self.file_sub ([(^putenv,)
101 def autoupdate (self): 107 def autoupdate (self):
102 self.system ('cd %(srcdir)s && autoreconf') 108 self.system ('cd %(srcdir)s && autoreconf')
103 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs': 109 # .libs/libguile_2.0_la-arbiters.o: In function `__gmpz_abs':
104 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs' 110 # arbiters.c:(.text+0x0): multiple definition of `__gmpz_abs'
105 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure') 111 self.file_sub ([('-std=gnu99', ''),('-std=c99', '')], '%(srcdir)s/configure')
161 class Guile__mingw (Guile): 167 class Guile__mingw (Guile):
162 def __init__ (self, settings, source): 168 def __init__ (self, settings, source):
163 Guile.__init__ (self, settings, source) 169 Guile.__init__ (self, settings, source)
164 # Configure (compile) without -mwindows for console 170 # Configure (compile) without -mwindows for console
165 self.target_gcc_flags = '-mms-bitfields' 171 self.target_gcc_flags = '-mms-bitfields'
166 patches = Guile.patches + [ 172 patches = Guile.patches + [ # [x for x in Guile.patches if not 'libunistring' in x] + [
167 'guile-1.9.14-mingw.patch', 173 'guile-1.9.14-mingw.patch',
168 'guile-1.9.14-gnulib-mingw.patch', 174 'guile-1.9.14-gnulib-mingw.patch',
169 'guile-1.9.14-mingw-dirent.patch', 175 'guile-1.9.14-mingw-dirent.patch',
176 #'guile-1.9.14-gnulib-libunistring-retooled.patch',
170 ] 177 ]
171 dependencies = (Guile.dependencies 178 dependencies = (Guile.dependencies
172 + [ 179 + [
173 'regex-devel', 180 'regex-devel',
174 'mingw-extras', 181 'mingw-extras',
195 self.file_sub ([('''^#(LIBOBJS=".*fileblocks.*)''', r'\1')], 202 self.file_sub ([('''^#(LIBOBJS=".*fileblocks.*)''', r'\1')],
196 '%(srcdir)s/configure') 203 '%(srcdir)s/configure')
197 Guile.configure (self) 204 Guile.configure (self)
198 for libtool in ['%(builddir)s/libtool']: # readline patched-out: '%(builddir)s/guile-readline/libtool']: 205 for libtool in ['%(builddir)s/libtool']: # readline patched-out: '%(builddir)s/guile-readline/libtool']:
199 self.file_sub ([('-mwindows', '')], libtool) 206 self.file_sub ([('-mwindows', '')], libtool)
200 def patch (self): 207
201 self.system ('cd %(srcdir)s && gnulib-tool --import --dir=. --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 alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile nproc putenv stat-time stdlib strcase strftime striconveh string sys_stat verify version-etc-fsf vsnprintf warnings accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket || :') 208 gnulib_modules = (Guile.gnulib_modules
202 Guile.patch (self) 209 + 'accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket ')
203 def compile (self): 210 def compile (self):
204 ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage? 211 ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage?
205 self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''') 212 self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''')
206 self.system ('cd %(builddir)s/libguile && cp guile_filter_doc_snarfage.exe guile_filter_doc_snarfage') 213 self.system ('cd %(builddir)s/libguile && cp guile_filter_doc_snarfage.exe guile_filter_doc_snarfage')
207 Guile.compile (self) 214 Guile.compile (self)