Mercurial > gub

comparison gub/specs/guile.py @ 6468:0ea4f16c7d7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guile: somewhat better relocation patch.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 01 Feb 2011 15:21:20 +0100
parents 73d419fb8438
children f1b28c608b3a
comparison
equal deleted inserted replaced
6467:a4af49dd321e 6468:0ea4f16c7d7a
129 # with 1.8.7: libtool: cannot install directory not ending in... 129 # with 1.8.7: libtool: cannot install directory not ending in...
130 # after config.status is being re-run for building of libpath.h 130 # after config.status is being re-run for building of libpath.h
131 self.update_libtool () 131 self.update_libtool ()
132 target.AutoBuild.install (self) 132 target.AutoBuild.install (self)
133 majmin_version = '.'.join (self.expand ('%(version)s').split ('.')[0:2]) 133 majmin_version = '.'.join (self.expand ('%(version)s').split ('.')[0:2])
134 majmin_version = '2.0'
134 135
135 self.dump ("prependdir GUILE_LOAD_PATH=$INSTALLER_PREFIX/share/guile/%(majmin_version)s\n", 136 self.dump ('''
137 prependdir GUILE_LOAD_PATH=$INSTALLER_PREFIX/share/guile/%(majmin_version)s
138 prependdir GUILE_LOAD_PATH=$INSTALLER_PREFIX/share/guile/site
139 prependdir GUILE_LOAD_COMPILED_PATH=$INSTALLER_PREFIX/lib/guile/%(majmin_version)s/ccache
140 ''',
136 '%(install_prefix)s/etc/relocate/guile.reloc', 141 '%(install_prefix)s/etc/relocate/guile.reloc',
137 env=locals ()) 142 env=locals ())
138 version = self.expand ('%(version)s') 143 version = self.expand ('%(version)s')
139 #FIXME: c&p linux.py 144 #FIXME: c&p linux.py
140 self.dump ('''\ 145 self.dump ('''\
167 ]) 172 ])
168 configure_flags = (Guile.configure_flags 173 configure_flags = (Guile.configure_flags
169 + ' --without-threads') 174 + ' --without-threads')
170 configure_variables = (Guile.configure_variables 175 configure_variables = (Guile.configure_variables
171 .replace ("':'", "';'") 176 .replace ("':'", "';'")
177 ###we're debugging here
178 ###CFLAGS='-O2 -DHAVE_CONFIG_H=1 -I%(builddir)s'
172 + misc.join_lines (''' 179 + misc.join_lines ('''
173 CFLAGS='-O2 -DHAVE_CONFIG_H=1 -I%(builddir)s' 180 CFLAGS='-g -DHAVE_CONFIG_H=1 -I%(builddir)s'
174 LIBS='-lgc -lmingw-extras' 181 LIBS='-lgc -lmingw-extras'
175 ''')) 182 '''))
176 config_cache_overrides = Guile.config_cache_overrides + ''' 183 config_cache_overrides = Guile.config_cache_overrides + '''
177 gl_cv_socket_ipv6=no 184 gl_cv_socket_ipv6=no
178 guile_cv_have_ipv6=no 185 guile_cv_have_ipv6=no