Porting to Mandriva2008

diff --git a/config_files/BOOST-1.34.1.sh b/config_files/BOOST-1.34.1.sh
index 5e74c78202e7e16b6565ceb38074ea5af673f852..5541ee12bd49c983eb911e7dccf1f83e737de6c8 100755 (executable)
--- a/config_files/BOOST-1.34.1.sh
+++ b/config_files/BOOST-1.34.1.sh
@@ -76,8 +76,8 @@ GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/BUILD.LOG <<EOF
 used gcc=$GCC
 EOF
-cd ${PRODUCT_DIR}_SRC/tools/build/jam_src
-check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh
+cd ${PRODUCT_DIR}_SRC/tools/jam/src
+check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh --release --with-python=${python_root}
 
 # apply patch to avoid conflicts with Qt signals
 # VSR 07/03/06 : this is no more needed
@@ -96,11 +96,10 @@ export binfolder=bin.linux
 else
 export binfolder=bin.linuxx86
 fi
-echo "`pwd` -> ./tools/build/jam_src/${binfolder}/bjam >> ${PRODUCT_DIR}/INSTALL.LOG"
-./tools/build/jam_src/${binfolder}/bjam "-sBOOST_ALL_DYN_LINK=1"         \
+echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam >> ${PRODUCT_DIR}/INSTALL.LOG"
+./tools/build/jam_src/${binfolder}/bjam --toolset=gcc "-sBOOST_ALL_DYN_LINK=1"         \
     "-sBUILD=release <runtime-link>dynamic <threading>multi"             \
     --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_DIR}_SRC                \
-    "-sPYTHON_VERSION=$python_version" --with-python-root=${python_root} \
     install >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog
 
 if [ "$?" -ne "0" ] ; then
@@ -116,9 +115,16 @@ rm -rf boost-1_32
 
 # create additional links for libraries
 cd ${PRODUCT_DIR}/lib
+
+gcc_root="`where_gcc $GCC_VERSION`"
+gcc_root=`cd ${gcc_root}/..; pwd`
+maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+gcc_ver=$maj_ver$min_ver
+
 for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec_monitor thread unit_test_framework ; do
-    if [ -f libboost_${aLib}-gcc-mt-1_32.so ] ; then
-       ln -s libboost_${aLib}-gcc-mt-1_32.so libboost_${aLib}-mt.so
+    if [ -f libboost_${aLib}-gcc${gcc_ver}-mt-1_34_1.so ] ; then
+       ln -s libboost_${aLib}-gcc${gcc_ver}-mt-1_34_1.so libboost_${aLib}-mt.so
     fi
 done
   if test `uname -m` = "x86_64" ; then

diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2sp3.sh
index 32b01d44c2cfba6f8b6953fba35d47c564343f3c..893b94a9c78f766ade5051cb995062d8cbf66e31 100755 (executable)
--- a/config_files/CAS-6.2sp3.sh
+++ b/config_files/CAS-6.2sp3.sh
@@ -99,6 +99,7 @@ cd ${PRODUCT_DIR}_SRC
 echo " +++++++++++ configure"
 
 is_mandriva2007=0
+is_mandriva2008=0
 is_debian40=0
 
 if [ -e /etc/issue ] ; then
@@ -106,12 +107,17 @@ if [ -e /etc/issue ] ; then
   if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
 fi
 
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
+  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
+fi
+
 if [ -e /etc/issue ] ; then
   grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
   if [ $? == 0 ] ; then is_debian40=1 ; fi
 fi
 
-if [ $is_mandriva2007 == 1 ] || [ $is_debian40 == 1 ] ; then
+if [ $is_mandriva2007 == 1 ] || $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then
 where_xmu_include=/usr/include/X11
 else
 where_xmu_include=/usr/X11R6/include/X11

diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh
index a39a9de66a9d3e94954995102fe2d32e99804d04..17e1bdbbd3b2b8ba3758297d3c916f93afccafc1 100755 (executable)
--- a/config_files/VTK-5.0.0.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -32,7 +32,7 @@ export VTKHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VTKHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${VTKHOME}/lib:\${LD_LIBRARY_PATH}
 export PYTHONPATH=\${VTKHOME}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
+export TCLLIBPATH="\${VTKHOME}/lib/vtk-5.0/tcl \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/med-2.3.2.sh b/config_files/med-2.3.2.sh
index 79304d316bc905df72ed1c6025c3cfa2a19064f3..8192a025f068ac26a8d0554b1f795c08fa1fefb6 100755 (executable)
--- a/config_files/med-2.3.2.sh
+++ b/config_files/med-2.3.2.sh
@@ -80,21 +80,24 @@ makedir ${PRODUCT_DIR}
 #vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4)
 is_mandriva=0
 is_mandriva2007=0
+is_mandriva2008=0
 is_fedora=0
 if [ -e /etc/redhat-release ] ; then
   grep -e "Mandriva Linux release 2006.0" /etc/redhat-release > /dev/null
   if [ $? == 0 ] ; then is_mandriva=1 ; fi
   grep -e "Mandriva Linux release 2007.0" /etc/redhat-release > /dev/null
   if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
+  grep -e "Mandriva Linux release 2008.0" /etc/redhat-release > /dev/null
+  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
   grep -e "Fedora Core release 4" /etc/redhat-release > /dev/null
   if [ $? == 0 ] ; then is_fedora=1 ; fi
 fi
-if [ $is_mandriva2007 == 1 ] ; then
+if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2007 == 1 ] ; then
 chmod +w ./Makefile.am
 mv Makefile.am Makefile.am.orig
 sed -e 's/ include src tests tools doc / include src tools doc /g' Makefile.am.orig > Makefile.am
 fi
-if [ $is_mandriva == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_fedora == 1 ] ; then
+if [ $is_mandriva == 1 ] || [ $is_mandriva2007 == 1 ]  || [ $is_mandriva2008 == 1 ] || [ $is_fedora == 1 ] ; then
     if test `uname -m` = "x86_64" ; then
     echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
     ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_DIR}_SRC/errlog