
https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Typo in packages.fns. * buildfarm_worker/package.fns (default_conf_tc): Typo. * buildfarm_worker/brasilia.fns (init_icc_vars), * buildfarm_worker/caracas.fns: Add `-i-static' to LDFLAGS. brasilia.fns | 4 +++- caracas.fns | 2 +- package.fns | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) Index: buildfarm_worker/package.fns --- buildfarm_worker/package.fns (revision 364) +++ buildfarm_worker/package.fns (working copy) @@ -62,8 +62,7 @@ default_conf_tc() { deps="monoburg" export PATH="$prefix_root/monoburg/bin:$PATH" - prg_version=\ -"bison --version:swig -version:python -V:tc --version:ruby --version" + prg_version="bison --version:swig -version:python -V:tc --version:ruby --version" self_config="--enable-shared" distcheck_config="$self_config" } Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 364) +++ buildfarm_worker/caracas.fns (working copy) @@ -42,7 +42,7 @@ icc_dir="/lrde/beyrouth/admin/lrde/usr/intel/compiler90" # Don't use CXXFLAGS, it's CPP and LD stuffs. export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/" - export LDFLAGS="-cxxlib-icc" + export LDFLAGS="-cxxlib-icc -i-static" export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`" export PATH="$icc_dir/bin:$PATH" test_tree vaucanson-icc \ Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 364) +++ buildfarm_worker/brasilia.fns (working copy) @@ -5,6 +5,8 @@ # is defined here too. export CCACHE_DIR=/work/build/ccache +# INIT_ICC_VARS +# ------------- # Initialize ICC environment variables. init_icc_vars() { @@ -19,7 +21,7 @@ export CXXFLAGS="-gcc-name=gcc-4.0" # Don't use CXXFLAGS, it's CPP and LD stuffs. export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/" - export LDFLAGS="-cxxlib-icc" + export LDFLAGS="-cxxlib-icc -i-static" export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`" # The directory ~/bin contains replacement wrappers for icc and icpc, # because the installation of ICC on the lrde account is broken since