From: jfa <jfa@opencascade.com>
Date: Thu, 15 Mar 2007 06:58:28 +0000 (+0000)
Subject: A patch by Paul RASCLE for ASTER cluster (64 bits).
X-Git-Tag: V3_2_6pre2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b736f4e5d3d5de837b29ef4f5a0a6daa2a985297;p=modules%2Fkernel.git

A patch by Paul RASCLE for ASTER cluster (64 bits).
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 16dbf097d..ddc09fb7f 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -62,7 +62,10 @@ def get_lib_dir():
     if __lib__dir__: return __lib__dir__
     import platform
     if platform.architecture()[0] == "64bit":
-        __lib__dir__ = "lib64"
+        if platform.machine() == "ia64":
+            __lib__dir__ = "lib"
+        else:
+            __lib__dir__ = "lib64"
     else:
         __lib__dir__ = "lib"
     return get_lib_dir()
diff --git a/bin/virtual_salome.py b/bin/virtual_salome.py
index f77e6bfc3..44cb0b8a2 100644
--- a/bin/virtual_salome.py
+++ b/bin/virtual_salome.py
@@ -81,7 +81,10 @@ def get_lib_dir():
     if __lib__dir__: return __lib__dir__
     import platform
     if platform.architecture()[0] == "64bit":
-        __lib__dir__ = "lib64"
+        if platform.machine() == "ia64":
+            __lib__dir__ = "lib"
+        else:
+            __lib__dir__ = "lib64"
     else:
         __lib__dir__ = "lib"
     return get_lib_dir()
diff --git a/idl/Makefile.am b/idl/Makefile.am
index a09c9c622..9ec9d7fd4 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -26,6 +26,8 @@
 
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
+AM_CXXFLAGS = -fPIC
+
 BASEIDL_FILES = \
   SALOME_Exception.idl \
   SALOME_Comm.idl \
diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 1241d4a4f..4d3629531 100644
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -85,10 +85,11 @@ COMMON_LIBS =\
 	../SALOMELocalTrace/libSALOMELocalTrace.la \
 	../Basics/libSALOMEBasics.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la\
-	@PYTHON_LIBS@ \
 	@MPI_LIBS@ \
 	@CORBA_LIBS@
 
+#	@PYTHON_LIBS@
+
 #
 # ===============================================================
 # Libraries targets
@@ -111,6 +112,7 @@ libSalomeContainer_la_LDFLAGS  =\
 	@LDEXPDYNFLAGS@
 
 libSalomeContainer_la_LIBADD =\
+	$(PYTHON_LIBS) \
 	$(COMMON_LIBS)
 
 
diff --git a/src/HDFPersist/HDFdatasetWrite.c b/src/HDFPersist/HDFdatasetWrite.c
index 3dea8c5f5..625b316cb 100644
--- a/src/HDFPersist/HDFdatasetWrite.c
+++ b/src/HDFPersist/HDFdatasetWrite.c
@@ -23,6 +23,7 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore )
 ----------------------------------------------------------------------------*/
 
 #include "hdfi.h"
+#include <stdlib.h>
 
 /*
  * - Name : _MEDdatasetWrite
@@ -55,7 +56,7 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
     if(ndim < 0) return -1;
     
     hdf_size *dim = (hdf_size *) malloc(sizeof(hdf_size)*ndim);
-    if ((ret == HDFdatasetGetDim(id, dim)) < 0)  return -1;
+    if ((ret = HDFdatasetGetDim(id, dim)) < 0)  return -1;
 	
     for(i=0; i<ndim; i++) size+=dim[i];    
     free(dim);
diff --git a/src/HDFPersist/Makefile.am b/src/HDFPersist/Makefile.am
index b65ea9ac5..92cb42c97 100644
--- a/src/HDFPersist/Makefile.am
+++ b/src/HDFPersist/Makefile.am
@@ -104,3 +104,16 @@ EXTRA_DIST = \
   test7.cxx \
   test8.cxx \
   test9.cxx
+
+#bin_PROGRAMS=HDFtest1 HDFtest2 HDFtest3
+#HDFtest1_SOURCES = test1.c
+#HDFtest2_SOURCES = test2.c
+#HDFtest3_SOURCES = test3.cxx
+
+#AM_CFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \
+#                                  -I$(srcdir)/../SALOMELocalTrace \
+#                                  -I$(srcdir)/../Basics
+#AM_CXXFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \
+#                                  -I$(srcdir)/../SALOMELocalTrace \
+#                                  -I$(srcdir)/../Basics
+#AM_LDFLAGS= @HDF5_LIBS@
diff --git a/src/HDFPersist/test1.c b/src/HDFPersist/test1.c
index 26e77a915..c91ad895c 100644
--- a/src/HDFPersist/test1.c
+++ b/src/HDFPersist/test1.c
@@ -25,6 +25,9 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore )
 #include"hdfi.h"
 #include<stdlib.h>
 
+#define MESSAGE(msg) printf(msg);
+//__FILE__,":[",__LINE__,"]: ",
+
 int main() {
   hdf_idt fid,gid,did,atid;
   hdf_err ret;
diff --git a/src/KERNEL_PY/salome_shared_modules.py b/src/KERNEL_PY/salome_shared_modules.py
index 2222a4d9e..a4aff8eda 100755
--- a/src/KERNEL_PY/salome_shared_modules.py
+++ b/src/KERNEL_PY/salome_shared_modules.py
@@ -77,7 +77,10 @@ list_modules=[]
 path=salome_path.split(":")
 import platform
 if platform.architecture()[0] == "64bit":
-    libdir = "lib64"
+    if platform.machine() == "ia64":
+        libdir = "lib"
+    else:
+        libdir = "lib64"
 else:
     libdir = "lib"
 for rep in path:
diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am
index beb83ffe4..683429da3 100644
--- a/src/NOTIFICATION_SWIG/Makefile.am
+++ b/src/NOTIFICATION_SWIG/Makefile.am
@@ -53,8 +53,9 @@ _libNOTIFICATION_la_CPPFLAGS =\
 
 
 _libNOTIFICATION_la_LDFLAGS  = -module
-_libNOTIFICATION_la_LIBADD   = ../Notification/libSalomeNotification.la \
-	@PYTHON_LIBS@
+_libNOTIFICATION_la_LIBADD   = ../Notification/libSalomeNotification.la
+
+#	@PYTHON_LIBS@
 
 swig_wrap.cpp : $(SWIG_SOURCES)
 	$(SWIG) $(SWIG_FLAGS) -o $@ $<