From 3f9c1a9801ad909ad1f5ecdda7cf8565ef06294d Mon Sep 17 00:00:00 2001 From: maintenance team Date: Tue, 5 Feb 2008 12:22:20 +0000 Subject: [PATCH] Porting to Mandriva2008 --- config_files/BOOST-1.34.1.sh | 20 +++++++++++++------- config_files/CAS-6.2sp3.sh | 8 +++++++- config_files/VTK-5.0.0.sh | 2 +- config_files/med-2.3.2.sh | 7 +++++-- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/config_files/BOOST-1.34.1.sh b/config_files/BOOST-1.34.1.sh index 5e74c78..5541ee1 100755 --- 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 < ./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 dynamic 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 32b01d4..893b94a 100755 --- 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 a39a9de..17e1bdb 100755 --- 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 79304d3..8192a02 100755 --- 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 -- 2.39.2