From: vsr <vsr@opencascade.com>
Date: Mon, 19 Oct 2009 19:12:22 +0000 (+0000)
Subject: gcc 4.3 compatibility
X-Git-Tag: V5_1_3~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=34eca6f987e4ace823e6130f5c35a76ac20e4075;p=tools%2Finstall.git

gcc 4.3 compatibility
---

diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh
index 47bd5cf..467107a 100755
--- a/config_files/VTK-5.0.0.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -93,11 +93,17 @@ check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
 cd ${PRODUCT_SRC_DIR}/${PRODUCT}_SRC
 
-# apply a small patch for VTK (needed for gcc-3.4)
-sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
-mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
-sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkImageReader.cxx > IO/vtkImageReader.cxx.orig
-mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx
+# patch for gcc-3.4
+for f in IO/vtkBMPReader.cxx IO/vtkImageReader.cxx ; do
+    sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" ${f} > ${f}_
+    mv -f ${f}_ ${f}
+done
+
+# patch for gcc 4.3
+for f in Utilities/DICOMParser/DICOMAppHelper.cxx Utilities/DICOMParser/DICOMFile.cxx Utilities/DICOMParser/DICOMParser.cxx ; do
+    sed -e "s%#include <string>%#include <string>\n#include <string.h>%g" ${f} > ${f}_
+    mv -f ${f}_ ${f}
+done
 
 sed -e "s%char \*doc \=%const char \*doc \=%g" Common/vtkPythonUtil.cxx > Common/vtkPythonUtil.cxx.orig
 mv -f Common/vtkPythonUtil.cxx.orig Common/vtkPythonUtil.cxx
@@ -198,7 +204,7 @@ check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 cd ${PRODUCT_SRC_DIR}/${PRODUCT}_SRC/Wrapping/Python
 
-check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
 
 # set correct symbolic links - bug of python wrappings installation
 #      cd ${PRODUCT_DIR}/include
diff --git a/config_files/netgen-4.5.sh b/config_files/netgen-4.5.sh
index d96314a..dc0e53e 100755
--- a/config_files/netgen-4.5.sh
+++ b/config_files/netgen-4.5.sh
@@ -74,6 +74,9 @@ fi
 # additional patching for SALOME
 (cd ${PRODUCT_SRC_DIR}; cp ngtcltk/ngnewdelete.* libsrc/interface)
 
+# patch for gcc 4.3
+(cd ${PRODUCT_SRC_DIR}; sed -e "s%#include <string>%#include <string>\n#include <string.h>%g" libsrc/include/mystdlib.h > libsrc/include/mystdlib.h.1 ; mv -f libsrc/include/mystdlib.h.1 libsrc/include/mystdlib.h )
+
 # to generate environment scripts
 try_preinstalled
 }