* oln_master.cfg (f_oln_unix_gcc_4_1_64): Here, instead of g++ 4.1 specifically, since seattle no longer provides it. --- buildbot/masters/ChangeLog | 7 +++++++ buildbot/masters/oln_master.cfg | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 5da49da..3381712 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,10 @@ +2010-11-04 Roland Levillain <roland@lrde.epita.fr> + + Use the default g++ for Olena builds on on seattle. + + * oln_master.cfg (f_oln_unix_gcc_4_1_64): Here, instead of g++ 4.1 + specifically, since seattle no longer provides it. + 2010-11-02 Roland Levillain <roland@lrde.epita.fr> Disable GDCM for Olena on seattle (Intel 64 host). diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 5b5909d..328dbe7 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -54,6 +54,9 @@ c['schedulers'].append(AnyBranchScheduler(name='all', branches=None, 'i486-linux-gnu-gcc-4.2', 'i486-linux-gnu-icc-11.0', 'i486-linux-gnu-icc-10.1', + # FIXME: Rename this builder: we + # use the default g++ now, not + # g++ 4.1 specifically. 'x86-64-linux-gnu-gcc-4.1'])) ####### BUILDSLAVES @@ -129,18 +132,21 @@ f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', # GDCM has been disabled on this host, since GDCM it was located on a # remote NFS drive (/lrde/dev/linux-x86-64/stable/gdcm), and accessing # it was slowing down the build a lot. +# +# FIXME: Rename this build system: we use the default g++ now, not g++ +# 4.1 specifically. f_oln_unix_gcc_4_1_64 = GNUBuildSystem(project_repos='olena', project_name='olena', scm_step=checkout, branch=mybranch, - extra_configure_args='CXX="ccache g++-4.1" CC="ccache gcc-4.1" \ + extra_configure_args='CXX="ccache g++" CC="ccache gcc" \ --without-magickxx \ --enable-all', install_cmd=None, dist_cmd=None, upload_cmd=None, check_cmd='make -k check', - distcheck_configure_args='CXX=\'ccache g++-4.1\' CC=\'ccache gcc-4.1\' \ + distcheck_configure_args='CXX=\'ccache g++\' CC=\'ccache gcc\' \ --without-magickxx \ --enable-all' ) -- 1.5.6.5