Mercurial > gub
changeset 5605:964452fe46fc
guile: configure_flags update. Fixes build.
author | Jan Nieuwenhuizen <janneke@gnu.org> |
---|---|
date | Wed, 23 Sep 2009 14:38:21 +0200 |
parents | ea584e6e56de |
children | 6a76ca48aaab |
files | gub/specs/guile.py |
diffstat | 1 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/guile.py Wed Sep 23 14:38:06 2009 +0200 +++ b/gub/specs/guile.py Wed Sep 23 14:38:21 2009 +0200 @@ -50,7 +50,7 @@ self.file_sub ([('guile-readline', '')], '%(srcdir)s/Makefile.in') self.dump ('', '%(srcdir)s/doc/ref/version.texi') self.dump ('', '%(srcdir)s/doc/tutorial/version.texi') - def configure_flags (self): + def common_configure_flags (self): return misc.join_lines (''' --without-threads --with-gnu-ld @@ -60,6 +60,9 @@ --enable-relocation --enable-rpath ''') + def configure_flags (self): + return (target.AutoBuild.configure_flags (self) + + self.common_configure_flags ()) def configure_variables (self): return (target.AutoBuild.configure_variables (self) + misc.join_lines (''' @@ -147,8 +150,8 @@ + misc.join_lines (''' CFLAGS='-DHAVE_CONFIG_H=1 -I%(builddir)s' ''')) - def config_cache_overrides (self, str): - return str + ''' + def config_cache_overrides (self, string): + return string + ''' scm_cv_struct_timespec=${scm_cv_struct_timespec=no} guile_cv_func_usleep_declared=${guile_cv_func_usleep_declared=yes} guile_cv_exeext=${guile_cv_exeext=} @@ -176,8 +179,10 @@ + Guile.compile_command (self)) class Guile__linux__ppc (Guile__linux): - def config_cache_overrides (self, str): - return str + "\nguile_cv_have_libc_stack_end=no\n" + def config_cache_overrides (self, string): + return string + ''' +guile_cv_have_libc_stack_end=no +''' class Guile__freebsd (Guile): def config_cache_settings (self): @@ -186,12 +191,6 @@ ac_cv_type_socklen_t=yes guile_cv_use_csqrt="no" ''') - def configure_command (self): - return (Guile.configure_command (self) - # FIXME: eradicate LD_LIBRARY_PATH from guile.py - .replace ('LD_LIBRARY_PATH=%(system_prefix)s/lib:${LD_LIBRARY_PATH-/foe} ', '') - + Guile.configure_flags (self) - + Guile.configure_variables (self)) class Guile__darwin (Guile): patches = Guile.patches + ['guile-1.8.6-pthreads-cross.patch'] @@ -300,7 +299,7 @@ # libltdl. return ('LD_LIBRARY_PATH=%(system_prefix)s/lib:${LD_LIBRARY_PATH-/foe} ' + tools.AutoBuild.configure_command (self) - + Guile.configure_flags (self)) + + Guile.common_configure_flags (self)) def compile_command (self): # FIXME: when not x-building, guile runs gen_scmconfig, guile without # setting the proper LD_LIBRARY_PATH.