Implementation of support of 64bit

diff --git a/config_files/BOOST-1.32.0.sh b/config_files/BOOST-1.32.0.sh
index 35cee0af71215278a537b724714e0fdf3c7f4a9f..a13514058f7313c0c29d3a752a8f51453dec8e4a 100755 (executable)
--- a/config_files/BOOST-1.32.0.sh
+++ b/config_files/BOOST-1.32.0.sh
@@ -85,9 +85,13 @@ cd ${PRODUCT_WORK}
 python_root=`find_in_path python $PATH`;
 python_root=`cd ${python_root}/..; pwd`
 python_version=`python -c "import sys; print sys.version[:3]"`
-
-echo "`pwd` -> ./tools/build/jam_src/bin.linuxx86/bjam >> ${PRODUCT_DIR}/INSTALL.LOG"
-./tools/build/jam_src/bin.linuxx86/bjam "-sBOOST_ALL_DYN_LINK=1"         \
+if test `uname -m` = "x86_64" ; then
+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"         \
     "-sBUILD=release <runtime-link>dynamic <threading>multi"             \
     --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_WORK}                   \
     "-sPYTHON_VERSION=$python_version" --with-python-root=${python_root} \
@@ -111,7 +115,9 @@ for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec
        ln -s libboost_${aLib}-gcc-mt-1_32.so libboost_${aLib}-mt.so
     fi
 done
-
+  if test `uname -m` = "x86_64" ; then
+      cd ${PRODUCT_DIR}; ln -sf lib lib64
+  fi
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 

diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh
index 750f9822e80d17c74cf277cee362030620772a05..96a3df8342ff07b06473bcca3f267ada4b99efea 100755 (executable)
--- a/config_files/Numeric-23.7.sh
+++ b/config_files/Numeric-23.7.sh
@@ -57,7 +57,10 @@ makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/Numeric-23.7.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
-
+  if test `uname -m` = "x86_64" ; then
+export CFLAGS=-m64
+export CXXFLAGS=-m64
+  fi
 # check existence of lapack, f77blas, cblas, atlas, g2c libraries
 check_lib_version liblapack.so  $LD_LIBRARY_PATH:/usr/lib
 lapack_nf=$?
@@ -108,6 +111,10 @@ 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_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env

diff --git a/config_files/PyQt-3.14.1.sh b/config_files/PyQt-3.14.1.sh
index 56adf35d951d8ad2c374d70412ef43009d372cdf..0aa98bc99e100fb9872cb46f6a7a450f59f954ea 100755 (executable)
--- a/config_files/PyQt-3.14.1.sh
+++ b/config_files/PyQt-3.14.1.sh
@@ -44,10 +44,18 @@ if [ -z "${pyqt_sips}" ] ; then return 1 ; fi
 pyqt_sips=`cd $pyqt_sips/.. ; pwd`
 # check configuration file
 python_version="`python -c 'import sys; print sys.version[:3]'`"
+if test `uname -m` = "x86_64" ; then
+pyqt_cfg="`find_in_path pyqtconfig.py ${pyqtdir}:/usr/lib64/python${python_version}/site-packages`"
+else
 pyqt_cfg="`find_in_path pyqtconfig.py ${pyqtdir}:/usr/lib/python${python_version}/site-packages`"
+fi
 if [ -z "${pyqt_cfg}" ] ; then return 1 ; fi
 # check library
+if test `uname -m` = "x86_64" ; then
+pyqt_lib="`find_in_path qt.so ${pyqtdir}:/usr/lib64/python${python_version}/site-packages`"
+else
 pyqt_lib="`find_in_path qt.so ${pyqtdir}:/usr/lib/python${python_version}/site-packages`"
+fi
 if [ -z "${pyqt_lib}" ] ; then return 1 ; fi
 # check version
 ver=`cd ${pyqt_cfg} && python -c "from pyqtconfig import Configuration; c=Configuration();print c.__getattr__('pyqt_version_str')" 2>/dev/null`
@@ -94,6 +102,10 @@ makedir ${PRODUCT_DIR}
 check_jb tar xfz ${SOURCE_DIR}/PyQt-3.14.1.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 
+if test `uname -m` = "x86_64" ; then
+export CFLAGS=-m64 CXXFLAGS=-m64
+fi
+
 sed -e 's%check_license()$%#check_license()%g' configure.py > configure.py.new
 mv -f configure.py.new configure.py
 

diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh
index e23b836aef662eb93fbca7110e357d03b48519f7..66d50eb05a3c4884dc56b075002f7e065c24186d 100755 (executable)
--- a/config_files/Python-2.3.4.sh
+++ b/config_files/Python-2.3.4.sh
@@ -119,7 +119,6 @@ for sc in idle pydoc smtpd.py ; do
        chmod a+x "$sc"
     fi
 done
-
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env

diff --git a/config_files/Python-2.4.1.sh b/config_files/Python-2.4.1.sh
index cd183ec8b438f91538e6f7d72d7b0538e8ece502..9aebac10ee2f2a854a9c2f5c3b503224721242f8 100755 (executable)
--- a/config_files/Python-2.4.1.sh
+++ b/config_files/Python-2.4.1.sh
@@ -94,11 +94,37 @@ source ${INSTALL_WORK}/$SHRC
 
 makedir ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/Python-2.4.1.tar.gz -C ${INSTALL_WORK}
+if test `uname -m` = "x86_64" ; then
+export PYTHON_ARCHIVE_PREFIX="-lib64"
+export PYTHON_LIB_PREFIX="64"
+export CFLAGS=-m64
+export CXXFLAGS=-m64
+else
+export PYTHON_ARCHIVE_PREFIX=""
+fi
+
+check_jb tar xfz ${SOURCE_DIR}/Python-2.4.1${PYTHON_ARCHIVE_PREFIX}.tar.gz -C ${INSTALL_WORK}
+
+if test `uname -m` = "x86_64" ; then
+cp Python-2.4.1-lib64.patch ${PRODUCT_WORK} 
+cd ${PRODUCT_WORK} 
+patch -p 1 -i Python-2.4.1-lib64.patch
+rm -rf aclocal.m4
+aclocal >& /dev/null
+autoconf >& /dev/null
+aclocal >& /dev/null
+autoconf >& /dev/null
+else
 cd ${PRODUCT_WORK}
+fi
 
+if test `uname -m` = "x86_64" ; then
+PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64"
+else
+PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared"
+fi
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    ./configure --prefix=${PRODUCT_DIR} --with-threads --with-cxx=`which g++` --enable-shared
+    ./configure --prefix=${PRODUCT_DIR} $PYTHON_CONFIGURE_OPTIONS
 # vsr: force linking to libstdc++.so
 sed -e 's%\(^LIBS=.*\)%\1 -lstdc++%g' Makefile > _Makefile
 mv -f _Makefile Makefile
@@ -106,10 +132,9 @@ GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
-
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
-(cd ${PRODUCT_DIR}/lib/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so)
+(cd ${PRODUCT_DIR}/lib${PYTHON_LIB_PREFIX}/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so)
 
 cd ${PRODUCT_DIR}/bin
 for sc in idle pydoc smtpd.py ; do
@@ -120,6 +145,10 @@ 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_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env

diff --git a/config_files/SWIG-1.3.24.sh b/config_files/SWIG-1.3.24.sh
index af134eb58cda3e1cfdaaef9f40735a0f6676e7fa..9ae3ab932a4a12da32a02c83b77f9b6d5f4114ed 100755 (executable)
--- a/config_files/SWIG-1.3.24.sh
+++ b/config_files/SWIG-1.3.24.sh
@@ -57,9 +57,15 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
+if test `uname -m` = "x86_64" ; then
+export CFLAGS=-m64 
+export CXXFLAGS=-m64
+fi
+
 check_jb tar xfz ${SOURCE_DIR}/swig-1.3.24.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
+
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
   ./configure --prefix=${PRODUCT_DIR} 
 GCC=`which gcc`

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index 0f3ccf8df1ccbef9cc919e3614d840654db52600..1e056c6c997a572e8f3df7cc7cb454ecbdbfbfc1 100755 (executable)
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -66,7 +66,15 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${INSTALL_WORK}
-cd ${INSTALL_WORK}/cmake-1.6.6
+
+if test `uname -m` = "x86_64" ; then
+cp cmake-1.6.6.patch ${INSTALL_WORK}/cmake-1.6.6 
+cd ${INSTALL_WORK}/cmake-1.6.6 
+patch -p 1 -i cmake-1.6.6.patch
+else
+cd ${INSTALL_WORK}/cmake-1.6.6 
+fi
+
 check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
 cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
 used gcc=$GCC
@@ -75,7 +83,6 @@ check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
 check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
-
 # apply a small patch for VTK (needed for gcc-3.4)
 sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
 mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
@@ -106,6 +113,11 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF" 
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
+  if test `uname -m` = "x86_64" ; then
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+  fi
+
 ### Wrap Python settings
 if [ "${python_version}" != "" ]; then
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
@@ -129,8 +141,13 @@ fi
 ### if Mesa is pre-installed
 if [ -n "$MESA_HOME" ]; then
   VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
-  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
+  if test `uname -m` = "x86_64" ; then
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib64/libGL.so"
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib64/libGLU.so"
+  else
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
+      VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
+  fi
   VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
 fi
 
@@ -147,7 +164,14 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
+  if test `uname -m` = "x86_64" ; then
+cd ${PRODUCT_WORK}/Wrapping/Python
+sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in
+mv -f _setup.py.in setup.py.in
+chmod a+x setup.py.in
+else
 cd ${PRODUCT_WORK}/Wrapping/Python
+  fi
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log

diff --git a/config_files/common.sh b/config_files/common.sh
index b4b5bb8f2077a72a775343d914e15570ae82daed..88dde90c2430934d13daa0a4e273952978cc38e2 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -307,8 +307,13 @@ sed -e 's%export\([[:blank:]]*\)PYTHONPATH=\$[{]\?PYTHONPATH[}]\?:\(.*\)%exporta
 sed -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\$[{]\?LD_RUN_PATH[}]\?:\(.*\)%exporta\1LD_RUN_PATH \2%g' -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\(.*\):\$[{]\?LD_RUN_PATH[}]\?%exportp\1LD_RUN_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2
 
 # Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
+if test `uname -m` = "x86_64" ; then
+echo '# Setting /usr/X11R6/lib64 path in LD_LIBRARY_PATH for the libGL.so.1 file' >> ${INSTALL_WORK}/_tmp2
+echo 'export LD_LIBRARY_PATH=/usr/X11R6/lib64:${LD_LIBRARY_PATH}' >> ${INSTALL_WORK}/_tmp2
+else
 echo '# Setting /usr/X11R6/lib path in LD_LIBRARY_PATH for the libGL.so.1 file' >> ${INSTALL_WORK}/_tmp2
 echo 'export LD_LIBRARY_PATH=/usr/X11R6/lib:${LD_LIBRARY_PATH}' >> ${INSTALL_WORK}/_tmp2
+fi
 
 cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/_$SHRC
 

diff --git a/config_files/docutils-0.3.7.sh b/config_files/docutils-0.3.7.sh
index 126cf5449a2db1e52c54d70e628afd4367cc721d..81318efaff6528e451da918c7150f32b77943047 100755 (executable)
--- a/config_files/docutils-0.3.7.sh
+++ b/config_files/docutils-0.3.7.sh
@@ -47,6 +47,10 @@ 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
+
 rm -fr ${PRODUCT_WORK}
 
 print_env

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index 49d075557d5cfa09a75b21734cc6d6d45422d2ef..cf92afc4e60ad5babebed3783286a31cb31da8ac 100755 (executable)
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -70,7 +70,11 @@ check_jb tar xfz ${SOURCE_DIR}/graphviz-2.2.1.tar.gz -C ${INSTALL_WORK}
 
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
+  if test `uname -m` = "x86_64" ; then
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-expatlibdir=/usr/lib64 --with-tcl=${TCLHOME} --disable-rpath CFLAGS=-m64 CXXFLAGS=-m64
+  else
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=${TCLHOME} --disable-rpath 
+  fi
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC

diff --git a/config_files/hdf5-1.6.4.sh b/config_files/hdf5-1.6.4.sh
index ae744a14430e5caefba807027c01c3c223f8159a..065f442c024342be63653eb966c8bb9b8bc0288c 100755 (executable)
--- a/config_files/hdf5-1.6.4.sh
+++ b/config_files/hdf5-1.6.4.sh
@@ -67,13 +67,16 @@ install_source()
 {
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
-
+if test `uname -m` = "x86_64" ; then
+HDF_CONFIGURE_OPTIONS="-disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2        --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib CFLAGS=-m64 CXXFLAGS=-m64"
+else
+HDF_CONFIGURE_OPTIONS="-disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2        --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib"
+fi
 check_jb tar xfz ${SOURCE_DIR}/hdf5-1.6.4.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    ./configure --prefix=${PRODUCT_DIR} --disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 \
-       --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib 
+    ./configure --prefix=${PRODUCT_DIR} $HDF_CONFIGURE_OPTIONS
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC

diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh
index 11e6bb75568175a13d197c67e68b0e5b9e3db754..eebceaf2810df235e020125f43f5287cc86df917 100755 (executable)
--- a/config_files/med-2.2.3.sh
+++ b/config_files/med-2.2.3.sh
@@ -73,8 +73,13 @@ fi
 if [ $is_mandriva == 0 ] ; then
     check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
 else
+    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> ${INSTALL_WORK}/errlog
+    else
     echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
     ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
+    fi
     if [ "$?" -ne "0" ] ; then
       cat ${PRODUCT_DIR}/CONFIGURE.LOG
       cat ${INSTALL_WORK}/errlog >&2

diff --git a/config_files/netgen-4.5.sh b/config_files/netgen-4.5.sh
index 53a901249523572d723ff6e4ecb8b41948c9d8d8..54ca7a394482931ac6406abb9650e29e66cc397f 100755 (executable)
--- a/config_files/netgen-4.5.sh
+++ b/config_files/netgen-4.5.sh
@@ -50,6 +50,12 @@ makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/netgen-4.5.tar.gz -C ${INSTALL_WORK}
 
+if test `uname -m` = "x86_64" ; then
+cp netgen-4.5.patch ${INSTALL_WORK}
+cd ${INSTALL_WORK}
+patch -p 0 -i netgen-4.5.patch
+fi
+
 export MACHINE=LINUX
 
 # apply general patch for SALOME

diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh
index 8cc814a081a4aefdf96f0daea623f03db163e6ef..004915c6a9f63d9afd59fdbac8361cf305c81442 100755 (executable)
--- a/config_files/omniORB-4.0.7.sh
+++ b/config_files/omniORB-4.0.7.sh
@@ -28,11 +28,16 @@ return 0
 
 print_env()
 {
+
+if test `uname -m` = "x86_64" ; then
+export OMNI_LIB_PREFIX="64"
+fi
+
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export OMNIORBDIR=\${INSTALL_ROOT}/${PRODUCT}
 export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
-export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PYTHONPATH=\${OMNIORBDIR}/lib\${OMNI_LIB_PREFIX}:\${OMNIORBDIR}/lib\${OMNI_LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
@@ -85,12 +90,25 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
+
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.7.tar.gz -C ${INSTALL_WORK}
 check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.7.tar.gz -C ${INSTALL_WORK}
 check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${INSTALL_WORK}
 
+if test `uname -m` = "x86_64" ; then
+cp omniORB-4.0.7.patch ${INSTALL_WORK}/omniORB-4.0.7
+cp omniORBpy-2.7.patch ${INSTALL_WORK}/omniORBpy-2.7
+cp omniNotify-2.1.patch ${INSTALL_WORK}/omniNotify
+cd ${INSTALL_WORK}/omniORB-4.0.7
+patch -p 1 -i omniORB-4.0.7.patch
+cd ${INSTALL_WORK}/omniORBpy-2.7
+patch -p 1 -i omniORBpy-2.7.patch
+cd ${INSTALL_WORK}/omniNotify
+patch -p 1 -i omniNotify-2.1.patch
+fi
+
 # install omniORB
 cd ${INSTALL_WORK}/omniORB-4.0.7
 mkdir build
@@ -123,6 +141,7 @@ check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
 
 # install omniNotify
 cd ${INSTALL_WORK}/omniNotify
+
 mkdir build
 cd build
 
@@ -144,6 +163,10 @@ sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
 mv -f _omniidlrun.py omniidlrun.py
 chmod a+x omniidlrun.py
 
+if test `uname -m` = "x86_64" ; then
+cd ${PRODUCT_DIR}; ln -s lib lib64
+fi
+
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}
 rm -fr ${INSTALL_WORK}/omniORB-4.0.7

diff --git a/config_files/qt-3.3.4.sh b/config_files/qt-3.3.4.sh
index 961bcfc022f9e1eb5b0483a5f3596cd8f3b7f050..684af19d8b2f1920e1fe5e544124ca83ea1e5219 100755 (executable)
--- a/config_files/qt-3.3.4.sh
+++ b/config_files/qt-3.3.4.sh
@@ -26,15 +26,22 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
+
 qtdir=""
-if [ -d /usr/share/qt3/lib ] ; then
-    qtdir="`find_in_path libqt-mt.so.3.3 /usr/share/qt3/lib`"
+  if test `uname -m` = "x86_64" ; then
+      export QT_LD_PREFIX='64'
+  else
+      QT_LD_PREFIX=''
+  fi
+
+if [ -d /usr/share/qt3/lib${QT_LD_PREFIX} ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3 /usr/share/qt3/lib\${QT_LD_PREFIX}`"
 fi
-if [ -z "${qtdir}" ] && [ -d /usr/lib/qt3/lib ] ; then
-    qtdir="`find_in_path libqt-mt.so.3.3 /usr/lib/qt3/lib`"
+if [ -z "${qtdir}" ] && [ -d /usr/lib/qt3/lib${QT_LD_PREFIX} ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3 /usr/lib/qt3/lib${QT_LD_PREFIX}`"
 fi
 if [ -z "${qtdir}" ] ; then
-    qtdir="`find_in_path libqt-mt.so.3.3 /usr/lib`"
+    qtdir="`find_in_path libqt-mt.so.3.3 /usr/lib${QT_LD_PREFIX}`"
 fi
 if [ -z "${qtdir}" ] ; then
     qtdir="`find_in_path libqt-mt.so.3.3 ${LD_LIBRARY_PATH}`"
@@ -46,7 +53,7 @@ if [ -n "${qtdir}" ] ; then
     if [ -n "${moc}" ] && [ -n "${uic}" ] ; then
        tmp="\${QTDIR}/bin ${qtdir}/bin \${PATH} ${PATH}";  
        path=`sort_path ${tmp}`
-       tmp="\${QTDIR}/lib ${qtdir}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+       tmp="\${QTDIR}/lib${QT_LD_PREFIX} ${qtdir}/lib${QT_LD_PREFIX} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
        ld_library_path=`sort_path ${tmp}`
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -75,7 +82,14 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/qt-3.3.4.tar.gz -C ${INSTALL_WORK}
+
+if test `uname -m` = "x86_64" ; then
+cp qt-3.3.4.patch ${PRODUCT_WORK}
 cd ${PRODUCT_WORK}
+patch -p 1 -i qt-3.3.4.patch
+else
+cd ${PRODUCT_WORK}
+fi
 
 mv -f configure configure-orig
 sed -e "s%read acceptance%acceptance=yes%" configure-orig > configure
@@ -85,7 +99,11 @@ export QTDIR=${PRODUCT_WORK}
 export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH
 
 # basic flags
-QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
+  if test `uname -m` = "x86_64" ; then
+      QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++-64"
+  else
+      QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
+  fi
 # use system graphics libraries
 QT_FLAGS=$QT_FLAGS" -system-libjpeg -system-libpng -system-libmng -qt-imgfmt-jpeg -qt-imgfmt-png -qt-imgfmt-mng -lpng -lmng -ljpeg"
 # prefix
@@ -112,6 +130,11 @@ export INSTALL_ROOT_BACKUP=$INSTALL_ROOT
 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 `ls ${PRODUCT_WORK}/bin`; do

diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh
index 0a2a6baa47487796caabdef9c3d3386450afcaee..734a89d4e1aeffbe224ef5c5ad757a92aaacb0f6 100755 (executable)
--- a/config_files/qwt-4.2.0.sh
+++ b/config_files/qwt-4.2.0.sh
@@ -31,7 +31,11 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
+if test `uname -m` = "x86_64" ; then
+qwthome="`find_in_path libqwt.so ${LD_LIBRARY_PATH}:/usr/lib64:/usr/local/lib64`"
+else
 qwthome="`find_in_path libqwt.so ${LD_LIBRARY_PATH}:/usr/lib:/usr/local/lib`"
+fi
 if [ -n "${qwthome}" ] ; then
     qwtroot=`cd ${qwthome}/..; pwd`
     qwtinc="`find_in_path qwt_global.h ${qwtroot}/include:${qwtroot}/include/qwt:${QTDIR}/include/qwt:/usr/lib/qt3/include/qwt:/usr/local/lib/qt3/include/qwt`"

diff --git a/config_files/sip-4.2.1.sh b/config_files/sip-4.2.1.sh
index 03d0d40299f4ed4b05d26d2eb5bdb9a6d2be78b9..515f683dc198425b8623d8e2e00a996ee5168e62 100755 (executable)
--- a/config_files/sip-4.2.1.sh
+++ b/config_files/sip-4.2.1.sh
@@ -35,7 +35,11 @@ try_native(){
 sipdir="`find_in_path sip ${PATH}:/usr/bin`"
 if [ -n "${sipdir}" ] ; then
     python_version="`python -c 'import sys; print sys.version[:3]'`"
+if test `uname -m` = "x86_64" ; then
+    sippython="`find_in_path sip.so ${PYTHONPATH}:/usr/lib64/python${python_version}/site-packages`"
+else
     sippython="`find_in_path sip.so ${PYTHONPATH}:/usr/lib/python${python_version}/site-packages`"
+fi
     if [ -n "${sippython}" ]; then
        ver=`${sipdir}/sip -V | awk '{print $1}'`
        maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
@@ -78,10 +82,23 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/sip-4.2.1.tar.gz -C ${INSTALL_WORK}
-cd ${PRODUCT_WORK}
+
+  if test `uname -m` = "x86_64" ; then
+      cp sip-4.2.1.patch ${PRODUCT_WORK}
+      cd ${PRODUCT_WORK}
+      patch -p 1 -i sip-4.2.1.patch
+      else
+      cd ${PRODUCT_WORK}
+  fi
+
+  if test `uname -m` = "x86_64" ; then
+      SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt -p linux-g++-64"
+      else
+      SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt"
+  fi
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    python configure.py -b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt 
+    python configure.py $SIP_CONFIGURE_OPTIONS
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC

diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh
index 5e1929b3c6e506f1e54d6e7f6e777873093818a4..0629061a33c7e781e7aed8ac31bb9434485194ee 100755 (executable)
--- a/config_files/tcltk-8.4.5.sh
+++ b/config_files/tcltk-8.4.5.sh
@@ -91,8 +91,11 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-makedir ${PRODUCT_DIR}
+if test `uname -m` = "x86_64" ; then
+export CFLAGS=-m64
+fi
 
+makedir ${PRODUCT_DIR}
 check_jb tar xfz ${SOURCE_DIR}/tcl8.4.5.tar.gz -C ${INSTALL_WORK}
 cd ${INSTALL_WORK}/tcl8.4.5/unix
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF