From: maintenance team Date: Thu, 19 Oct 2006 14:28:14 +0000 (+0000) Subject: Small correction X-Git-Tag: V_3_2_3~25 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=284f495e7d904a7684d52143e5f53d18ebf5909a;p=tools%2Finstall.git Small correction --- diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh index 1e056c6..c35db83 100755 --- a/config_files/VTK-4.2.6.sh +++ b/config_files/VTK-4.2.6.sh @@ -82,7 +82,15 @@ EOF check_job ${PRODUCT_DIR}/MAKEcmake.LOG make check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK} + +if test `uname -m` = "x86_64" ; then +cp ${SOURCE_DIR}/../../config_files/vtk-4.2.6.patch ${PRODUCT_WORK} +cd ${PRODUCT_WORK} +patch -p 1 -i vtk-4.2.6.patch +else cd ${PRODUCT_WORK} +fi + # apply a small patch for VTK (needed for gcc-3.4) sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx @@ -164,24 +172,32 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install - if test `uname -m` = "x86_64" ; then -cd ${PRODUCT_WORK}/Wrapping/Python -sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in -mv -f _setup.py.in setup.py.in -chmod a+x setup.py.in -else +# if test `uname -m` = "x86_64" ; then +#cd ${PRODUCT_WORK}/Wrapping/Python +#sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in +#mv -f _setup.py.in setup.py.in +#chmod a+x setup.py.in +#else cd ${PRODUCT_WORK}/Wrapping/Python - fi +# fi check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR} +# set correct symbolic links - bug of python wrappings installation + if test `uname -m` = "x86_64" ; then + cd ${PRODUCT_DIR}/lib64/python${python_version}/site-packages/vtk_python + else + cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python + fi + ln -sf ../../../vtk/*Python*.so . + + if test `uname -m` = "x86_64" ; then + cd ${PRODUCT_DIR}; ln -sf lib64 lib + fi + #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log #du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6 -# set correct symbolic links - bug of python wrappings installation -cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python -ln -sf ../../../vtk/*Python*.so . - print_env } diff --git a/config_files/vtk-4.2.6.patch b/config_files/vtk-4.2.6.patch new file mode 100644 index 0000000..f5a3710 --- /dev/null +++ b/config_files/vtk-4.2.6.patch @@ -0,0 +1,820 @@ +diff -Naur VTK-4.2.6-original/CMake/FindOSMesa.cmake VTK-4.2.6-changed/CMake/FindOSMesa.cmake +--- VTK-4.2.6-original/CMake/FindOSMesa.cmake 2003-02-12 02:05:20.000000000 +0300 ++++ VTK-4.2.6-changed/CMake/FindOSMesa.cmake 2006-10-03 11:33:54.000000000 +0400 +@@ -19,11 +19,11 @@ + # in the main Mesa library + IF (NOT OSMESA_LIBRARY) + FIND_LIBRARY(OSMESA_LIBRARY OSMesa +- /usr/lib +- /usr/local/lib +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /opt/graphics/OpenGL/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + ENDIF (NOT OSMESA_LIBRARY) + +diff -Naur VTK-4.2.6-original/CMakeLists.txt VTK-4.2.6-changed/CMakeLists.txt +--- VTK-4.2.6-original/CMakeLists.txt 2004-03-03 22:28:17.000000000 +0300 ++++ VTK-4.2.6-changed/CMakeLists.txt 2006-10-04 14:02:56.000000000 +0400 +@@ -448,8 +448,8 @@ + # Configure Matrox Imaging support. + IF(VTK_USE_MATROX_IMAGING) + FIND_LIBRARY(MIL_LIBRARY MIL +- "C:/Program Files/Matrox Imaging/mil/library/winnt/msc/dll" +- "C:/Program Files/Matrox Imaging/mil/library/windows/msc/dll" ++ "C:/Program Files/Matrox Imaging/mil/lib64rary/winnt/msc/dll" ++ "C:/Program Files/Matrox Imaging/mil/lib64rary/windows/msc/dll" + ) + FIND_PATH(MIL_INCLUDE_PATH mil.h + "C:/Program Files/Matrox Imaging/mil/include" +@@ -698,11 +698,11 @@ + ENDIF(VTK_USE_PARALLEL) + + # Install cmake extensions so user projects can load them. +-INSTALL_FILES(/lib/vtk/CMake FILES ++INSTALL_FILES(/lib64/vtk/CMake FILES + ${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake) + FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2 + VTK_MAKE_INSTANTIATOR2 VTK_GENERATE_JAVA_DEPENDENCIES) +- INSTALL_FILES(/lib/vtk/CMake FILES ++ INSTALL_FILES(/lib64/vtk/CMake FILES + "${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}" + ) + ENDFOREACH(cmd) +@@ -710,7 +710,7 @@ + # Save the compiler settings so another project can import them. + INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake) + CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake) +-INSTALL_FILES(/lib/vtk .cmake VTKBuildSettings) ++INSTALL_FILES(/lib64/vtk .cmake VTKBuildSettings) + + # Save library dependencies. + EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake) +@@ -720,9 +720,9 @@ + + # Install some files. + INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits) +-INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends) ++INSTALL_FILES(/lib64/vtk .cmake UseVTK VTKLibraryDepends) + IF(VTK_WRAP_HINTS) +- INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS}) ++ INSTALL_FILES(/lib64/vtk FILES ${VTK_WRAP_HINTS}) + ENDIF(VTK_WRAP_HINTS) + + #----------------------------------------------------------------------------- +diff -Naur VTK-4.2.6-original/Common/CMakeLists.txt VTK-4.2.6-changed/Common/CMakeLists.txt +--- VTK-4.2.6-original/Common/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300 ++++ VTK-4.2.6-changed/Common/CMakeLists.txt 2006-10-04 14:03:25.000000000 +0400 +@@ -250,7 +250,7 @@ + VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS}) + ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx) + TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon) +- INSTALL_TARGETS(/lib/vtk vtkCommonTCL) ++ INSTALL_TARGETS(/lib64/vtk vtkCommonTCL) + INSTALL_FILES(/include/vtk .h + vtkTclUtil + ) +@@ -271,7 +271,7 @@ + ENDIF(WIN32) + TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon) + +- INSTALL_TARGETS(/lib/vtk vtkCommonPython) ++ INSTALL_TARGETS(/lib64/vtk vtkCommonPython) + INSTALL_FILES(/include/vtk .h + vtkPythonUtil + ) +@@ -284,13 +284,13 @@ + VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS}) + ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx) + TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon) +- INSTALL_TARGETS(/lib/vtk vtkCommonJava) ++ INSTALL_TARGETS(/lib64/vtk vtkCommonJava) + INSTALL_FILES(/include/vtk .h + vtkJavaUtil + ) + ENDIF (VTK_WRAP_JAVA) + +-INSTALL_TARGETS(/lib/vtk vtkCommon) ++INSTALL_TARGETS(/lib64/vtk vtkCommon) + INSTALL_FILES(/include/vtk .h ${Common_SRCS} + vtkCellType + vtkSetGet +@@ -306,7 +306,7 @@ + vtkImageProgressIterator + ) + +-INSTALL_FILES(/lib/vtk/testing FILES ++INSTALL_FILES(/lib64/vtk/testing FILES + ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py + ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl + ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl +@@ -314,6 +314,6 @@ + INSTALL_FILES(/include/vtk FILES + ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h) + IF(VTK_USE_PARALLEL) +- INSTALL_FILES(/lib/vtk/testing FILES ++ INSTALL_FILES(/lib64/vtk/testing FILES + ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl) + ENDIF(VTK_USE_PARALLEL) +diff -Naur VTK-4.2.6-original/Common/Testing/Install/test.sh.in VTK-4.2.6-changed/Common/Testing/Install/test.sh.in +--- VTK-4.2.6-original/Common/Testing/Install/test.sh.in 2006-10-04 11:09:49.000000000 +0400 ++++ VTK-4.2.6-changed/Common/Testing/Install/test.sh.in 2006-10-04 11:09:24.000000000 +0400 +@@ -47,7 +47,7 @@ + echo "Writing CMakeCache.txt" + ( + cat > CMakeCache.txt <