From: vsr <vsr@opencascade.com>
Date: Sat, 24 May 2008 13:35:16 +0000 (+0000)
Subject: Support Scientific Linux 5.1 64bit
X-Git-Tag: V_3_2_10~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e5f3fa3a90c9d0a35ab655a2ebc53faf54021c11;p=tools%2Finstall.git

Support Scientific Linux 5.1 64bit
---

diff --git a/config_files/patches/qt-3.3.6-lib64.patch b/config_files/patches/qt-3.3.6-lib64.patch
new file mode 100755
index 0000000..863cba4
--- /dev/null
+++ b/config_files/patches/qt-3.3.6-lib64.patch
@@ -0,0 +1,21 @@
+diff -Naur --exclude=CVS qt-3.3.6-orig/mkspecs/linux-g++-64/qmake.conf qt-3.3.6/mkspecs/linux-g++-64/qmake.conf
+--- qt-3.3.6-orig/mkspecs/linux-g++-64/qmake.conf	2006-03-08 19:48:20.000000000 +0300
++++ qt-3.3.6/mkspecs/linux-g++-64/qmake.conf	2008-05-24 15:41:58.000000000 +0400
+@@ -20,7 +20,7 @@
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe -m64
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+@@ -48,7 +48,7 @@
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64 /usr/lib64
+ 
+ QMAKE_LINK		= g++
+ QMAKE_LINK_SHLIB	= g++
diff --git a/config_files/qt-3.3.6.sh b/config_files/qt-3.3.6.sh
index 2c45b88..b172a1b 100755
--- a/config_files/qt-3.3.6.sh
+++ b/config_files/qt-3.3.6.sh
@@ -95,6 +95,14 @@ makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/qt-3.3.6.tar.gz -C ${INSTALL_WORK}
 
+# apply patch for 64-bit platforms
+if test `uname -m` = "x86_64" ; then
+    if [ -f patches/qt-3.3.6-lib64.patch ] ; then
+	cp patches/qt-3.3.6-lib64.patch ${PRODUCT_WORK}
+	( cd ${PRODUCT_WORK} ; patch -p1 < qt-3.3.6-lib64.patch )
+    fi
+fi
+
 cd ${PRODUCT_WORK}
 
 mv -f configure configure-orig