From: vsr <vsr@opencascade.com>
Date: Fri, 23 May 2008 13:39:09 +0000 (+0000)
Subject: Fix pb with OpenGL libraries (for qt) on 64bit platforms (RHEL 4 64bit)
X-Git-Tag: V_3_2_10~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9ac0bdc81dd5ccd69c98636351b43f5faa7630ea;p=tools%2Finstall.git

Fix pb with OpenGL libraries (for qt) on 64bit platforms (RHEL 4 64bit)
---

diff --git a/config_files/patches/qt-3.3.4-lib64.patch b/config_files/patches/qt-3.3.4-lib64.patch
index f5051b8..c50eb83 100755
--- a/config_files/patches/qt-3.3.4-lib64.patch
+++ b/config_files/patches/qt-3.3.4-lib64.patch
@@ -1,6 +1,6 @@
-diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf
---- qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf	2005-01-21 20:16:44.000000000 +0300
-+++ qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf	2006-10-12 14:09:27.000000000 +0400
+diff -Naur --exclude=CVS qt-3.3.4-orig/mkspecs/linux-g++-64/qmake.conf qt-3.3.4/mkspecs/linux-g++-64/qmake.conf
+--- qt-3.3.4-orig/mkspecs/linux-g++-64/qmake.conf	2005-01-21 20:16:44.000000000 +0300
++++ qt-3.3.4/mkspecs/linux-g++-64/qmake.conf	2008-05-23 17:34:01.000000000 +0400
 @@ -17,7 +17,7 @@
  QMAKE_LEXFLAGS		=
  QMAKE_YACC		= yacc
@@ -10,3 +10,12 @@ diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mk
  QMAKE_CFLAGS_DEPS	= -M
  QMAKE_CFLAGS_WARN_ON	= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	= -w
+@@ -45,7 +45,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++