https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Adjust paths to tools. * buildfarm_worker/brasilia.fns: Fix ICC settings. Don't use Automake 1.10 from /lrde/dev/ (provided by Debian Sid). * buildfarm_worker/caracas.fns (host_type): Set to linux-x86/etch. Fix ICC settings. Use Autoconf 2.61 from /lrde/dev/. Don't use Bison 2.3 from /lrde/dev/ (provided by Debian Etch). * buildfarm_worker/houston.fns (host_type): Set to linux-x86/etch. Use Autoconf 2.61 from /lrde/dev/. * buildfarm_worker/marvejols.fns (host_type): Set to linux-x86/etch. Use Autoconf 2.61 from /lrde/dev/. Don't use Bison 2.3 from /lrde/dev/ (provided by Debian Etch). * buildfarm_worker/istanbul.fns (host_type): Set to linux-sparc64/sarge. Use Autoconf 2.61 and Automake 1.10 from /lrde/dev/. brasilia.fns | 9 ++------- caracas.fns | 6 +++--- houston.fns | 5 +++-- istanbul.fns | 4 ++-- marvejols.fns | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 424) +++ buildfarm_worker/caracas.fns (working copy) @@ -3,13 +3,13 @@ # Used to build Tiger (and Vaucanson). -host_type=linux-x86/sarge +host_type=linux-x86/etch # Add ICC (from /lrde/dev) to the PATH. -/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh +source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 automake-1.10 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 # Tell autoreconf 1.10 where other M4 macros live. export ACLOCAL='aclocal -I /usr/share/aclocal/' Index: buildfarm_worker/houston.fns --- buildfarm_worker/houston.fns (revision 424) +++ buildfarm_worker/houston.fns (working copy) @@ -3,15 +3,16 @@ # Used to compile Vaucanson. -host_type=linux-x86/sarge +host_type=linux-x86/etch # Get init_icc_vars's definition. source tools.fns # Add ICC (from /lrde/dev) to the PATH. source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh + # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 automake-1.10 +path_prepend autoconf-2.61 automake-1.10 # Tell autoreconf 1.10 where other M4 macros live. export ACLOCAL='aclocal -I /usr/share/aclocal/' Index: buildfarm_worker/marvejols.fns --- buildfarm_worker/marvejols.fns (revision 424) +++ buildfarm_worker/marvejols.fns (working copy) @@ -1,11 +1,11 @@ # marvejols. -*- shell-script -*- -host_type=linux-x86/sarge +host_type=linux-x86/etch # Nix settings. . /nix/etc/profile.d/nix.sh # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 # The ccache dir is located in the /work file system on. As # ~/.zshenv is not sourced by the build script, this environment Index: buildfarm_worker/istanbul.fns --- buildfarm_worker/istanbul.fns (revision 424) +++ buildfarm_worker/istanbul.fns (working copy) @@ -1,9 +1,9 @@ # istanbul. -*- shell-script -*- -host_type=linux-sparc64 +host_type=linux-sparc64/sarge # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 bison-2.3 export CCACHE_DIR="/work/build/var/ccache" Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 424) +++ buildfarm_worker/brasilia.fns (working copy) @@ -8,13 +8,8 @@ # Get init_icc_vars's definition. source tools.fns -# Add ICC (from /lrde/dev) to the PATH... -/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh - -# ... as Automake 1.10 (not yet in Sid). -path_prepend automake-1.10 -# Tell autoreconf 1.10 where other M4 macros live. -export ACLOCAL='aclocal -I /usr/share/aclocal/' +# Add ICC (from /lrde/dev) to the PATH. +source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh # The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is