From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 14 Nov 2007 12:32:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V_4_1_1~75
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c4e5a8ad6d86e6aa8a485cb22725eb6f090e8c76;p=tools%2Finstall.git

*** empty log message ***
---

diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2sp3.sh
index d082705..32b01d4 100755
--- a/config_files/CAS-6.2sp3.sh
+++ b/config_files/CAS-6.2sp3.sh
@@ -117,15 +117,11 @@ else
 where_xmu_include=/usr/X11R6/include/X11
 fi
 
+flags="$flags --with-xmu-include=$where_xmu_include"
+
 if test `uname -m` = "x86_64" ; then
-    flags="$flags --with-xmu-include=$where_xmu_include"
-    if [ $is_debian40 == 1 ]; then
     flags="$flags --with-xmu-library=/usr/lib64"
-    else
-    flags="$flags --with-xmu-library=/usr/X11R6/lib64"	
-    fi
 else
-    flags="$flags --with-xmu-include=$where_xmu_include"
     flags="$flags --with-xmu-library=/usr/X11R6/lib"
 fi
 
diff --git a/config_files/patches/omniNotify-2.1-lib64.patch b/config_files/patches/omniNotify-2.1-lib64.patch
new file mode 100755
index 0000000..ed9997a
--- /dev/null
+++ b/config_files/patches/omniNotify-2.1-lib64.patch
@@ -0,0 +1,94 @@
+diff -Naur omniNotify-orig/include/RDIstrstream.h omniNotify/include/RDIstrstream.h
+--- omniNotify/include/RDIstrstream.h	2003-10-12 22:51:15.000000000 +0400
++++ omniNotify/include/RDIstrstream.h	2006-09-28 17:44:20.000000000 +0400
+@@ -57,8 +57,10 @@
+   RDIstrstream& operator<<(const void *p);
+   RDIstrstream& operator<<(int n);
+   RDIstrstream& operator<<(unsigned int n);
++#ifndef HAS_LongLong
+   RDIstrstream& operator<<(long n);
+   RDIstrstream& operator<<(unsigned long n);
++#endif
+   RDIstrstream& operator<<(short n) {return operator<<((int)n);}
+   RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
+ #ifdef HAS_LongLong
+diff -Naur omniNotify-orig/include/RDITimeWrappers.h omniNotify/include/RDITimeWrappers.h
+--- omniNotify/include/RDITimeWrappers.h	2003-10-23 17:28:18.000000000 +0400
++++ omniNotify/include/RDITimeWrappers.h	2006-09-28 18:10:41.000000000 +0400
+@@ -236,8 +236,11 @@
+   // pretty-printing of absolute local time -- no newline
+   void out_local(RDIstrstream& str) {
+     CORBA::ULong ts, tn;
+-    get_posixbase_secs_nanosecs(ts, tn);
+-    RDI_posixbase_out_time(str, ts, tn);
++    unsigned long ts3, tn3;   
++    get_posixbase_secs_nanosecs(ts3, tn3);
++    RDI_posixbase_out_time(str, ts3, tn3);
++    ts = (CORBA::ULong)ts3;
++    tn = (CORBA::ULong)tn3;
+     str << " (local time)";
+   }
+ 
+@@ -396,8 +399,11 @@
+   // pretty-printing of absolute univ time -- no newline
+   void out_gmt(RDIstrstream& str) {
+     CORBA::ULong ts, tn;
+-    get_gmt_posixbase_secs_nanosecs(ts, tn);
+-    RDI_posixbase_out_time(str, ts, tn);
++    unsigned long ts4, tn4;
++    get_gmt_posixbase_secs_nanosecs(ts4, tn4);
++    RDI_posixbase_out_time(str, ts4, tn4);
++    ts = (CORBA::ULong)ts4;
++    tn = (CORBA::ULong)tn4;
+     str << " (greenwich mean time)";
+   }
+   // static helpers for producing TimeBase::UtcT min and max
+diff -Naur omniNotify-orig/lib/RDIstrstream.cc omniNotify/lib/RDIstrstream.cc
+--- omniNotify/lib/RDIstrstream.cc	2003-10-23 08:39:12.000000000 +0400
++++ omniNotify/lib/RDIstrstream.cc	2006-09-28 16:56:03.000000000 +0400
+@@ -175,6 +175,7 @@
+   return *this;
+ }
+ 
++#ifndef HAS_LongLong
+ RDIstrstream&
+ RDIstrstream::operator<<(long n)
+ {
+@@ -194,6 +195,7 @@
+   width_fill();
+   return *this;
+ }
++#endif
+ 
+ #ifdef HAS_LongLong
+ RDIstrstream&
+diff -Naur omniNotify-orig/lib/RDITimeWrappers.cc omniNotify/lib/RDITimeWrappers.cc
+--- omniNotify/lib/RDITimeWrappers.cc	2003-10-23 08:39:12.000000000 +0400
++++ omniNotify/lib/RDITimeWrappers.cc	2006-09-28 16:56:09.000000000 +0400
+@@ -147,7 +147,10 @@
+ #define WHATFN "RDI_TimeT::fmt_local"
+ const char *RDI_TimeT::fmt_local() {
+   CORBA::ULong ts, tm;
+-  get_posixbase_secs_msecs(ts, tm);
++  unsigned long ts2, tm2;
++  get_posixbase_secs_msecs(ts2, tm2);
++  ts = (CORBA::ULong)ts2;
++  tm = (CORBA::ULong)tm2;
+   time_t secs_as_time_t = ts;
+   TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
+   RDI_TimeT_fmt_local_buf_idx = (RDI_TimeT_fmt_local_buf_idx + 1) % 10;
+diff -Naur omniNotify/mk/beforeauto.mk.in omniNotify/mk/beforeauto.mk.in
+--- omniNotify/mk/beforeauto.mk.in	2003-10-29 22:18:36.000000000 +0300
++++ omniNotify/mk/beforeauto.mk.in	2006-10-13 16:58:26.000000000 +0400
+@@ -95,9 +95,9 @@
+ 
+ CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
+ 
+-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
+ 
+-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
+ 
+ 
+ #############################################################################