New '-w' (without GUI) key was added to build MED module with '--without-ihm' key.

[tools/install.git] / config_files / sip-4.2.1.sh

diff --git a/config_files/sip-4.2.1.sh b/config_files/sip-4.2.1.sh
index 03d0d40299f4ed4b05d26d2eb5bdb9a6d2be78b9..0a4dc7611914b84f852a39a358ef434735077b90 100755 (executable)
--- a/config_files/sip-4.2.1.sh
+++ b/config_files/sip-4.2.1.sh
@@ -1,4 +1,16 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : sip-4.2.1.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
 
 check_version()
 {
@@ -35,7 +47,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 +94,25 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/sip-4.2.1.tar.gz -C ${INSTALL_WORK}
+
+# apply patch for 64-bit platforms
+if test `uname -m` = "x86_64" ; then
+    if [ -f patches/sip-4.2.1-lib64.patch ] ; then
+       cp patches/sip-4.2.1-lib64.patch ${PRODUCT_WORK}
+       ( cd ${PRODUCT_WORK} ; patch -p1 < sip-4.2.1-lib64.patch )
+    fi
+fi
+
 cd ${PRODUCT_WORK}
 
+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