| 1 |
markusle 08/02/22 13:35:14 |
| 2 |
|
| 3 |
Added: vtk-5.0.3-mpi.patch |
| 4 |
Removed: vtk-5.0.3-lammpi.patch |
| 5 |
vtk-5.0.1-python2.5-gentoo.patch |
| 6 |
Log: |
| 7 |
Removed support for mpich and added support for mpich2, openmpi, and lam-mpi. Also fixed some QA issues and added qt4 eclass. |
| 8 |
(Portage version: 2.1.4.4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-libs/vtk/files/vtk-5.0.3-mpi.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/files/vtk-5.0.3-mpi.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/files/vtk-5.0.3-mpi.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: vtk-5.0.3-mpi.patch |
| 17 |
=================================================================== |
| 18 |
diff -Naur VTK/Parallel/CMakeLists.txt VTK.new/Parallel/CMakeLists.txt |
| 19 |
--- VTK/Parallel/CMakeLists.txt 2007-03-28 15:38:46.000000000 -0500 |
| 20 |
+++ VTK.new/Parallel/CMakeLists.txt 2008-02-21 15:16:04.000000000 -0500 |
| 21 |
@@ -78,6 +78,8 @@ |
| 22 |
|
| 23 |
IF (VTK_USE_MPI) |
| 24 |
INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake) |
| 25 |
+ INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindLAMMPI.cmake) |
| 26 |
+ INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindOpenmpi.cmake) |
| 27 |
SET ( Kit_SRCS |
| 28 |
${Kit_SRCS} |
| 29 |
vtkMPICommunicator.cxx |
| 30 |
@@ -94,6 +96,18 @@ |
| 31 |
IF (MPI_EXTRA_LIBRARY) |
| 32 |
SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}") |
| 33 |
ENDIF (MPI_EXTRA_LIBRARY) |
| 34 |
+ IF (LAMMPI_LIBRARY) |
| 35 |
+ SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_LIBRARY}") |
| 36 |
+ ENDIF (LAMMPI_LIBRARY) |
| 37 |
+ IF (LAMMPI_EXTRA_LIBRARY) |
| 38 |
+ SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_EXTRA_LIBRARY}") |
| 39 |
+ ENDIF (LAMMPI_EXTRA_LIBRARY) |
| 40 |
+ IF (OPENMPI_LIBRARY) |
| 41 |
+ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_LIBRARY}") |
| 42 |
+ ENDIF (OPENMPI_LIBRARY) |
| 43 |
+ IF (OPENMPI_EXTRA_LIBRARY) |
| 44 |
+ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_EXTRA_LIBRARY}") |
| 45 |
+ ENDIF (OPENMPI_EXTRA_LIBRARY) |
| 46 |
ENDIF (VTK_USE_MPI) |
| 47 |
|
| 48 |
SET(Kit_EXTRA_SRCS) |
| 49 |
diff -Naur VTK/Parallel/FindLAMMPI.cmake VTK.new/Parallel/FindLAMMPI.cmake |
| 50 |
--- VTK/Parallel/FindLAMMPI.cmake 1969-12-31 19:00:00.000000000 -0500 |
| 51 |
+++ VTK.new/Parallel/FindLAMMPI.cmake 2008-02-21 15:13:38.000000000 -0500 |
| 52 |
@@ -0,0 +1,17 @@ |
| 53 |
+# - Find LamMPI |
| 54 |
+FIND_LIBRARY(LAMMPI_LIBRARY |
| 55 |
+ NAMES lam |
| 56 |
+ PATHS /usr/lib /usr/lib64 |
| 57 |
+ "$ENV{ProgramFiles}/MPICH/SDK/Lib" |
| 58 |
+ "$ENV{ProgramFiles}/MPICH2/Lib" |
| 59 |
+ "C:/Program Files/MPICH/SDK/Lib" |
| 60 |
+) |
| 61 |
+ |
| 62 |
+FIND_LIBRARY(LAMMPI_EXTRA_LIBRARY |
| 63 |
+ NAMES lammpi++ |
| 64 |
+ PATHS /usr/lib /usr/lib64 |
| 65 |
+ "$ENV{ProgramFiles}/MPICH/SDK/Lib" |
| 66 |
+ "C:/Program Files/MPICH/SDK/Lib" |
| 67 |
+ DOC "If a second mpi library is necessary, specify it here.") |
| 68 |
+ |
| 69 |
+MARK_AS_ADVANCED(LAMMPI_LIBRARY LAMMPI_EXTRA_LIBRARY) |
| 70 |
diff -Naur VTK/Parallel/FindOpenmpi.cmake VTK.new/Parallel/FindOpenmpi.cmake |
| 71 |
--- VTK/Parallel/FindOpenmpi.cmake 1969-12-31 19:00:00.000000000 -0500 |
| 72 |
+++ VTK.new/Parallel/FindOpenmpi.cmake 2008-02-21 15:14:23.000000000 -0500 |
| 73 |
@@ -0,0 +1,18 @@ |
| 74 |
+# - Find openmpi |
| 75 |
+FIND_PATH(MPI_INCLUDE_PATH mpi.h |
| 76 |
+ /usr/include |
| 77 |
+ /usr/include/openmpi |
| 78 |
+) |
| 79 |
+ |
| 80 |
+FIND_LIBRARY(OPENMPI_LIBRARY |
| 81 |
+ NAMES mpi |
| 82 |
+ PATHS /usr/lib /usr/lib64 |
| 83 |
+) |
| 84 |
+ |
| 85 |
+FIND_LIBRARY(OPENMPI_EXTRA_LIBRARY |
| 86 |
+ NAMES mpi_cxx |
| 87 |
+ PATHS /usr/lib /usr/lib64 |
| 88 |
+ DOC "If a second mpi library is necessary, specify it here.") |
| 89 |
+ |
| 90 |
+MARK_AS_ADVANCED(OPENMPI_LIBRARY OPENMPI_EXTRA_LIBRARY) |
| 91 |
+ |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
-- |
| 96 |
gentoo-commits@l.g.o mailing list |
Archives