From 76e1c8455ee7592af77ce8f2e89ea6f88da23ed4 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Fri, 18 Apr 2008 07:37:37 +0000 Subject: [PATCH] Update for Salome 4.1.2 and install Salome modules to lib instead of lib64 --- config_files/BLSURFPLUGIN.sh | 2 +- config_files/BOOST-1.34.1.sh | 24 +++++--------- config_files/CALCULATOR.sh | 2 +- .../{CAS-6.2.1sp1.sh => CAS-6.2.1sp2.sh} | 4 +-- config_files/COMPONENT.sh | 2 +- config_files/DOCUMENTATION.sh | 2 +- config_files/FILTER.sh | 2 +- config_files/GEOM.sh | 2 +- config_files/GHS3DPLUGIN.sh | 2 +- config_files/GHS3DPRLPLUGIN.sh | 2 +- config_files/GUI.sh | 2 +- config_files/HELLO.sh | 2 +- config_files/HXX2SALOME.sh | 2 +- config_files/HXX2SALOMEDOC.sh | 2 +- config_files/HexoticPLUGIN.sh | 2 +- config_files/KERNEL.sh | 2 +- config_files/LIGHT.sh | 2 +- config_files/MED.sh | 2 +- config_files/MULTIPR.sh | 2 +- config_files/NETGENPLUGIN.sh | 2 +- config_files/Numeric-24.2.sh | 5 --- config_files/PYCALCULATOR.sh | 2 +- config_files/PYHELLO.sh | 2 +- config_files/PyQt-3.17.4.sh | 1 - config_files/Python-2.4.4.sh | 32 ++++++++----------- config_files/RANDOMIZER.sh | 2 +- config_files/SAMPLES.sh | 2 +- config_files/SIERPINSKY.sh | 2 +- config_files/SMESH.sh | 2 +- config_files/SUPERV.sh | 2 +- config_files/SWIG-1.3.31.sh | 1 - config_files/VISU.sh | 2 +- config_files/VTK-5.0.0.sh | 13 ++++---- config_files/YACS.sh | 2 +- config_files/docutils-0.3.9.sh | 4 --- config_files/doxygen-1.4.7.sh | 29 ++--------------- config_files/graphviz-2.16.1.sh | 1 - config_files/hdf5-1.6.4.sh | 1 - config_files/libxml2-2.6.27.sh | 1 - config_files/med-2.3.3.sh | 30 ++++++++++------- config_files/msg2qm.sh | 1 - config_files/netgen-4.5.sh | 1 - config_files/omniORB-4.1.0.sh | 16 +--------- config_files/qt-3.3.8.sh | 4 --- config_files/sip-4.7.3.sh | 26 ++++----------- config_files/tcltk-8.4.14.sh | 1 - config_files/xdata-0.5.52.sh | 1 - 47 files changed, 85 insertions(+), 165 deletions(-) rename config_files/{CAS-6.2.1sp1.sh => CAS-6.2.1sp2.sh} (99%) diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index 83b4b92..99dd7a5 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${BLSURFPLUGIN_ROOT_DIR}" ]; then diff --git a/config_files/BOOST-1.34.1.sh b/config_files/BOOST-1.34.1.sh index 7491b7c..9ebed6c 100755 --- a/config_files/BOOST-1.34.1.sh +++ b/config_files/BOOST-1.34.1.sh @@ -84,13 +84,6 @@ python_version=`python -c "import sys; print sys.version[:3]"` cd ${PRODUCT_SRC_DIR}/tools/jam/src check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh --debug --with-python=${python_root} -# apply patch to avoid conflicts with Qt signals -# VSR 07/03/06 : this is no more needed -#cd ${PRODUCT_SRC_DIR}/boost/signals/detail -#sed -e "s%# define BOOST_SIGNALS_NAMESPACE signals%# define BOOST_SIGNALS_NAMESPACE bsignals%g" \ -# signals_common.hpp > signals_common.hpp.orig -#mv -f signals_common.hpp.orig signals_common.hpp - # install cd ${PRODUCT_SRC_DIR} @@ -99,11 +92,14 @@ export binfolder=bin.linux.debug else export binfolder=bin.linuxx86.debug fi -echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam >> ${PRODUCT_DIR}/INSTALL.LOG" -./tools/jam/src/${binfolder}/bjam --toolset=gcc "-sBOOST_ALL_DYN_LINK=1" \ - "-sBUILD=release dynamic multi" \ - --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} \ - install >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog + +OPTIONS="toolset=gcc variant=release" +OPTIONS="${OPTIONS} runtime-link=shared threading=multi" +OPTIONS="${OPTIONS} -sBOOST_ALL_DYN_LINK=1" +OPTIONS="${OPTIONS} --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} install" + +echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG" +./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog if [ "$?" -ne "0" ] ; then cat ${PRODUCT_DIR}/INSTALL.LOG @@ -131,10 +127,6 @@ for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec fi done - if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}; ln -sf lib lib64 - fi -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index 4acbaa4..1b2dffc 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then diff --git a/config_files/CAS-6.2.1sp1.sh b/config_files/CAS-6.2.1sp2.sh similarity index 99% rename from config_files/CAS-6.2.1sp1.sh rename to config_files/CAS-6.2.1sp2.sh index 7fd81ec..ea9df58 100755 --- a/config_files/CAS-6.2.1sp1.sh +++ b/config_files/CAS-6.2.1sp2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : CAS-6.2.1sp1.sh +# File : CAS-6.2.1sp2.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -283,7 +283,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="CAS-6.2.1sp1" +export PRODUCT="CAS-6.2.1sp2" export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh index 8fb03dd..638b5f7 100755 --- a/config_files/COMPONENT.sh +++ b/config_files/COMPONENT.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${COMPONENT_ROOT_DIR}" ]; then diff --git a/config_files/DOCUMENTATION.sh b/config_files/DOCUMENTATION.sh index 055db0a..fcdbf64 100755 --- a/config_files/DOCUMENTATION.sh +++ b/config_files/DOCUMENTATION.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ # There is no possibility to check version number diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh index 95d3bce..e046867 100755 --- a/config_files/FILTER.sh +++ b/config_files/FILTER.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${FILTER_ROOT_DIR}" ]; then diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh index 1d090d9..016ff17 100755 --- a/config_files/GEOM.sh +++ b/config_files/GEOM.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${GEOM_ROOT_DIR}" ]; then diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh index 7b595fa..0b6d9dd 100755 --- a/config_files/GHS3DPLUGIN.sh +++ b/config_files/GHS3DPLUGIN.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh index 2110aed..d261976 100755 --- a/config_files/GHS3DPRLPLUGIN.sh +++ b/config_files/GHS3DPRLPLUGIN.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${GHS3DPRLPLUGIN_ROOT_DIR}" ]; then diff --git a/config_files/GUI.sh b/config_files/GUI.sh index b9260e5..772e747 100755 --- a/config_files/GUI.sh +++ b/config_files/GUI.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${GUI_ROOT_DIR}" ]; then diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index 44fa5f0..e91dab1 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${HELLO_ROOT_DIR}" ]; then diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh index 835fef8..c476574 100755 --- a/config_files/HXX2SALOME.sh +++ b/config_files/HXX2SALOME.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ # No way to check version! diff --git a/config_files/HXX2SALOMEDOC.sh b/config_files/HXX2SALOMEDOC.sh index b04eec4..0136316 100755 --- a/config_files/HXX2SALOMEDOC.sh +++ b/config_files/HXX2SALOMEDOC.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ # No way to check version! diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh index 8fd1fdc..e84fea3 100755 --- a/config_files/HexoticPLUGIN.sh +++ b/config_files/HexoticPLUGIN.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${HexoticPLUGIN_ROOT_DIR}" ]; then diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh index 75e7c77..cb5d205 100755 --- a/config_files/KERNEL.sh +++ b/config_files/KERNEL.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${KERNEL_ROOT_DIR}" ]; then diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index 4aa5e25..ec9bbdf 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${LIGHT_ROOT_DIR}" ]; then diff --git a/config_files/MED.sh b/config_files/MED.sh index a214d7e..1615e74 100755 --- a/config_files/MED.sh +++ b/config_files/MED.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${MED_ROOT_DIR}" ]; then diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh index d01a67b..2e06a83 100755 --- a/config_files/MULTIPR.sh +++ b/config_files/MULTIPR.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${MULTIPR_ROOT_DIR}" ]; then diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh index b1c8992..0f16361 100755 --- a/config_files/NETGENPLUGIN.sh +++ b/config_files/NETGENPLUGIN.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then diff --git a/config_files/Numeric-24.2.sh b/config_files/Numeric-24.2.sh index c4202da..5216e79 100755 --- a/config_files/Numeric-24.2.sh +++ b/config_files/Numeric-24.2.sh @@ -123,11 +123,6 @@ fi check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR} - if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}; ln -sf lib64 lib - fi - -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh index 11c2549..e35a2c0 100755 --- a/config_files/PYCALCULATOR.sh +++ b/config_files/PYCALCULATOR.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index fa49eb4..dc9e2b0 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${PYHELLO_ROOT_DIR}" ]; then diff --git a/config_files/PyQt-3.17.4.sh b/config_files/PyQt-3.17.4.sh index b9f27af..3804485 100755 --- a/config_files/PyQt-3.17.4.sh +++ b/config_files/PyQt-3.17.4.sh @@ -97,7 +97,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.4.4.sh index 5cd41bf..360055e 100755 --- a/config_files/Python-2.4.4.sh +++ b/config_files/Python-2.4.4.sh @@ -73,7 +73,8 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUC source ${INSTALL_WORK}/$SHRC if test `uname -m` = "x86_64" ; then - export PYTHON_LIB_PREFIX="64" +# export PYTHON_LIB_PREFIX="64" + export PYTHON_ARCHIVE_PREFIX="" export CFLAGS=-m64 export CXXFLAGS=-m64 PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64" @@ -85,18 +86,18 @@ fi check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} # apply patch for 64-bit platforms -if test `uname -m` = "x86_64" ; then - if [ -f patches/python_patch_lib64.patch ] ; then - cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR} - ( cd ${PRODUCT_SRC_DIR} ; \ - patch -p1 < python_patch_lib64.patch ; \ - rm -rf aclocal.m4 ; \ - aclocal >& /dev/null ; \ - autoconf >& /dev/null ; \ - aclocal >& /dev/null ; \ - autoconf >& /dev/null ) - fi -fi +#if test `uname -m` = "x86_64" ; then +# if [ -f patches/python_patch_lib64.patch ] ; then +# cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR} +# ( cd ${PRODUCT_SRC_DIR} ; \ +# patch -p1 < python_patch_lib64.patch ; \ +# rm -rf aclocal.m4 ; \ +# aclocal >& /dev/null ; \ +# autoconf >& /dev/null ; \ +# aclocal >& /dev/null ; \ +# autoconf >& /dev/null ) +# fi +#fi # to generate environment scripts try_preinstalled @@ -134,11 +135,6 @@ for sc in idle pydoc smtpd.py ; do fi done -if test `uname -m` = "x86_64" ; then - ( cd ${PRODUCT_DIR}; ln -sf lib64 lib ) -fi - -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh index 16d4c30..3a26107 100755 --- a/config_files/RANDOMIZER.sh +++ b/config_files/RANDOMIZER.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${RANDOMIZER_ROOT_DIR}" ]; then diff --git a/config_files/SAMPLES.sh b/config_files/SAMPLES.sh index 45ae463..4cba131 100755 --- a/config_files/SAMPLES.sh +++ b/config_files/SAMPLES.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ # There is no possibility to check version number diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh index b4ebde8..4768c74 100755 --- a/config_files/SIERPINSKY.sh +++ b/config_files/SIERPINSKY.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${SIERPINSKY_ROOT_DIR}" ]; then diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index 20703eb..daf3be4 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${SMESH_ROOT_DIR}" ]; then diff --git a/config_files/SUPERV.sh b/config_files/SUPERV.sh index d88dd27..daf3a65 100755 --- a/config_files/SUPERV.sh +++ b/config_files/SUPERV.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${SUPERV_ROOT_DIR=}" ]; then diff --git a/config_files/SWIG-1.3.31.sh b/config_files/SWIG-1.3.31.sh index 1f212e9..86186e1 100755 --- a/config_files/SWIG-1.3.31.sh +++ b/config_files/SWIG-1.3.31.sh @@ -85,7 +85,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/VISU.sh b/config_files/VISU.sh index 90f3595..248fdc1 100755 --- a/config_files/VISU.sh +++ b/config_files/VISU.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${VISU_ROOT_DIR}" ]; then diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh index 026349a..0043982 100755 --- a/config_files/VTK-5.0.0.sh +++ b/config_files/VTK-5.0.0.sh @@ -200,9 +200,9 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD # cd ${PRODUCT_DIR}/include # ln -sf vtk-5.0 vtk - if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} . - fi +# if test `uname -m` = "x86_64" ; then +# cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} . +# fi # cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages # ln -sf vtk vtk_python @@ -210,11 +210,10 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD # cd ${PRODUCT_DIR}/lib # ln -sf ../lib vtk - if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* . - fi +# if test `uname -m` = "x86_64" ; then +# cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* . +# fi -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/YACS.sh b/config_files/YACS.sh index 7925a9a..d2fabeb 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="4.1.1" +VERSION="4.1.2" check_version(){ if [ -n "${YACS_ROOT_DIR}" ]; then diff --git a/config_files/docutils-0.3.9.sh b/config_files/docutils-0.3.9.sh index c83327f..299cdcc 100755 --- a/config_files/docutils-0.3.9.sh +++ b/config_files/docutils-0.3.9.sh @@ -78,10 +78,6 @@ mv -f _rst2html.py rst2html.py chmod a+x rst2html.py ln -sf rst2html.py rst2html - if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}; ln -sf lib64 lib - fi - # remove sources and temporary files after building if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR} diff --git a/config_files/doxygen-1.4.7.sh b/config_files/doxygen-1.4.7.sh index 16b3906..31aa0ce 100755 --- a/config_files/doxygen-1.4.7.sh +++ b/config_files/doxygen-1.4.7.sh @@ -77,13 +77,9 @@ install_source # build sources cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -# vsr: fix a bug on Mandrake-10.1: wrong qt library reference -sed -e "s/-lqt$/-lqt-mt/g" ./tmake/lib/linux-g++/tmake.conf > ./tmake/lib/linux-g++/tmake.conf.new -mv ./tmake/lib/linux-g++/tmake.conf.new ./tmake/lib/linux-g++/tmake.conf -# vsr: fix bug - configure fails on Red Hat 9 because of incorrect autodetect check for install tool -# so it is necessary to put it directly + f_install="--install "`which install` -# vsr: removed --with-doxywizard option (not compilable on some platforms) + check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR} $f_install GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE.LOG </dev/null 2>&1; ISFOUND=$? -#if [ ${ISFOUND} -eq 0 ] ; then which dot >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which makeindex >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which latex >/dev/null 2>&1; ISFOUND=$?; fi -##if [ ${ISFOUND} -eq 0 ] ; then which latex2html >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then which pslatex >/dev/null 2>&1; ISFOUND=$?; fi -##if [ ${ISFOUND} -eq 0 ] ; then which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi -#if [ ${ISFOUND} -eq 0 ] ; then -# check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs -# check_job ${PRODUCT_DIR}/MAKEINSTALLDOCS.LOG make install_docs -#else -# cat >> ${PRODUCT_DIR}/MAKEDOCS.LOG < ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/graphviz-2.16.1.sh b/config_files/graphviz-2.16.1.sh index 1a493af..ce5eb4f 100755 --- a/config_files/graphviz-2.16.1.sh +++ b/config_files/graphviz-2.16.1.sh @@ -90,7 +90,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/hdf5-1.6.4.sh b/config_files/hdf5-1.6.4.sh index 2d838fb..666bb68 100755 --- a/config_files/hdf5-1.6.4.sh +++ b/config_files/hdf5-1.6.4.sh @@ -96,7 +96,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/libxml2-2.6.27.sh b/config_files/libxml2-2.6.27.sh index 37e76d0..a27dd04 100755 --- a/config_files/libxml2-2.6.27.sh +++ b/config_files/libxml2-2.6.27.sh @@ -77,7 +77,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/med-2.3.3.sh b/config_files/med-2.3.3.sh index 88a88bb..e6fb964 100755 --- a/config_files/med-2.3.3.sh +++ b/config_files/med-2.3.3.sh @@ -78,26 +78,33 @@ cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} #vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4) -is_mandriva=0 +is_mandriva2006=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 +is_debian40=0 +is_fedora4=0 +is_fedora6=0 + +if [ -e /etc/issue ] ; then + grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_mandriva2006=1 ; fi + grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null if [ $? == 0 ] ; then is_mandriva2007=1 ; fi - grep -e "Mandriva Linux release 2008.0" /etc/redhat-release > /dev/null + grep -e "Mandriva Linux release 2008.0" /etc/issue > /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 + grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_debian40=1 ; fi + grep -e "Fedora Core release 4" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_fedora4=1 ; fi + grep -e "Fedora Core release 6" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_fedora6=1 ; fi fi -if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2007 == 1 ] ; then +if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora6 == 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_mandriva2008 == 1 ] || [ $is_fedora == 1 ] ; then +if [ $is_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 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_SRC_DIR}/errlog @@ -123,7 +130,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/msg2qm.sh b/config_files/msg2qm.sh index 5165288..8ad7f75 100755 --- a/config_files/msg2qm.sh +++ b/config_files/msg2qm.sh @@ -82,7 +82,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make cp -f msg2qm ${PRODUCT_DIR} -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/netgen-4.5.sh b/config_files/netgen-4.5.sh index b79ece3..6a9bd5f 100755 --- a/config_files/netgen-4.5.sh +++ b/config_files/netgen-4.5.sh @@ -114,7 +114,6 @@ for directory in csg general geom2d gprim linalg occ meshing opti stlgeom ; do done cp -f ${PRODUCT_SRC_DIR}/libsrc/include/mystdlib.h ${PRODUCT_SRC_DIR}/libsrc/include/mydefs.hpp ${PRODUCT_DIR}/include -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/omniORB-4.1.0.sh b/config_files/omniORB-4.1.0.sh index a466a91..965e954 100755 --- a/config_files/omniORB-4.1.0.sh +++ b/config_files/omniORB-4.1.0.sh @@ -117,16 +117,7 @@ cd ${PRODUCT_SRC_DIR}/omniORB-4.1.0_SRC mkdir build cd build -if [ -e /etc/redhat-release ] ; then - grep -e "Red Hat" /etc/redhat-release > /dev/null - if [ $? == 0 ] ; then is_redhat=1 ; fi -fi - -if [ "X$is_redhat" == "X1" ] ; then - check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} --disable-ipv6 -else - check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} -fi +check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG < _omniidlrun.py mv -f _omniidlrun.py omniidlrun.py chmod a+x omniidlrun.py -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR} # remove sources and temporary files after building diff --git a/config_files/qt-3.3.8.sh b/config_files/qt-3.3.8.sh index d040874..924e6ff 100755 --- a/config_files/qt-3.3.8.sh +++ b/config_files/qt-3.3.8.sh @@ -118,10 +118,6 @@ export INSTALL_ROOT="" check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install -if test `uname -m` = "x86_64" ; then - cd ${PRODUCT_DIR}; ln -sf lib lib64 -fi - export INSTALL_ROOT=$INSTALL_ROOT_BACKUP for b in `find bin -mindepth 1 -maxdepth 1 -name "*"`; do diff --git a/config_files/sip-4.7.3.sh b/config_files/sip-4.7.3.sh index b9d3e42..74b5a34 100755 --- a/config_files/sip-4.7.3.sh +++ b/config_files/sip-4.7.3.sh @@ -29,19 +29,13 @@ return 1 print_env_bin() { -if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then - LIB_PREFIX=64 -elif [ -d ${PRODUCT_DIR}/lib ] ; then - LIB_PREFIX="" -else - LIB_PREFIX=64 -fi + cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'` qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/bin',%g" sipconfig.py > sipconfig.py.1 @@ -139,7 +127,7 @@ if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then sed -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" sipconfig.py > sipconfig.py.1 sed -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" sipconfig.py.1 > sipconfig.py sed -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib${LIB_PREFIX}/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py + sed -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py sed -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" sipconfig.py > sipconfig.py.1 sed -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" sipconfig.py.1 > sipconfig.py sed -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py > sipconfig.py.1 diff --git a/config_files/tcltk-8.4.14.sh b/config_files/tcltk-8.4.14.sh index 95b3dfa..eb216f6 100755 --- a/config_files/tcltk-8.4.14.sh +++ b/config_files/tcltk-8.4.14.sh @@ -203,7 +203,6 @@ check_job ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG make install-exec (cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.so libtkx.so) (cd ${PRODUCT_DIR}/lib; ln -fs libtkx8.3.a libtkx.a) -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR} # remove sources and temporary files after building diff --git a/config_files/xdata-0.5.52.sh b/config_files/xdata-0.5.52.sh index 8262824..fe3f24b 100755 --- a/config_files/xdata-0.5.52.sh +++ b/config_files/xdata-0.5.52.sh @@ -85,7 +85,6 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/INSTALL.LOG make install -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; # remove sources and temporary files after building -- 2.39.2