r43981 - in /packages/mrmpi/trunk/debian: patches/add_config.patch patches/addcmake.patch patches/series patches/tweakcmake.patch rules
malat-guest at users.alioth.debian.org
malat-guest at users.alioth.debian.org
Wed Oct 26 18:54:30 UTC 2011
Author: malat-guest
Date: Wed Oct 26 18:54:30 2011
New Revision: 43981
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43981
Log:
getting things in shape
Added:
packages/mrmpi/trunk/debian/patches/add_config.patch
packages/mrmpi/trunk/debian/patches/tweakcmake.patch
Modified:
packages/mrmpi/trunk/debian/patches/addcmake.patch
packages/mrmpi/trunk/debian/patches/series
packages/mrmpi/trunk/debian/rules
Added: packages/mrmpi/trunk/debian/patches/add_config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/add_config.patch?rev=43981&op=file
==============================================================================
--- packages/mrmpi/trunk/debian/patches/add_config.patch (added)
+++ packages/mrmpi/trunk/debian/patches/add_config.patch Wed Oct 26 18:54:30 2011
@@ -1,0 +1,35 @@
+Index: mrmpi-1.0~20110620/src/mrmpi_config.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mrmpi-1.0~20110620/src/mrmpi_config.h 2011-10-26 20:50:39.000000000 +0200
+@@ -0,0 +1,30 @@
++/* ----------------------------------------------------------------------
++ MR-MPI = MapReduce-MPI library
++ http://www.cs.sandia.gov/~sjplimp/mapreduce.html
++ Steve Plimpton, sjplimp at sandia.gov, Sandia National Laboratories
++
++ Copyright (2009) Sandia Corporation. Under the terms of Contract
++ DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
++ certain rights in this software. This software is distributed under
++ the modified Berkeley Software Distribution (BSD) License.
++
++ See the README file in the top-level MapReduce directory.
++------------------------------------------------------------------------- */
++
++#ifndef MRMPI_CONFIG_H
++#define MRMPI_CONFIG_H
++
++#include "vtkConfigure.h"
++#include "vtkSystemIncludes.h"
++
++#if defined(WIN32) && defined(VTK_BUILD_SHARED_LIBS)
++ #if defined(MapReduceMPI_EXPORTS)
++ #define MRMPI_EXPORT __declspec( dllexport )
++ #else
++ #define MRMPI_EXPORT __declspec( dllimport )
++ #endif
++#else
++ #define MRMPI_EXPORT
++#endif
++
++#endif
Modified: packages/mrmpi/trunk/debian/patches/addcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/addcmake.patch?rev=43981&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/addcmake.patch (original)
+++ packages/mrmpi/trunk/debian/patches/addcmake.patch Wed Oct 26 18:54:30 2011
@@ -1,10 +1,10 @@
This is a shameless copy of the original VTK packaging
MapReduce-MPI is shipped as convenient copy within VTK
-Index: mrmpi-20Jun11/CMakeLists.txt
+Index: mrmpi-1.0~20110620/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-20Jun11/CMakeLists.txt 2011-10-26 19:50:05.000000000 +0200
++++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
@@ -0,0 +1,21 @@
+PROJECT (MAPREDUCE)
+
@@ -27,10 +27,10 @@
+
+ADD_SUBDIRECTORY (src)
+#ADD_SUBDIRECTORY (examples)
-Index: mrmpi-20Jun11/examples/CMakeLists.txt
+Index: mrmpi-1.0~20110620/examples/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-20Jun11/examples/CMakeLists.txt 2011-10-26 19:49:48.000000000 +0200
++++ mrmpi-1.0~20110620/examples/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
@@ -0,0 +1,10 @@
+SET (example_LIBS mrmpi)
+
@@ -42,10 +42,10 @@
+ADD_EXECUTABLE (rmat ${rmat_SOURCES})
+INCLUDE_DIRECTORIES(rmat ${VTK_SOURCE_DIR}/Utilities/mrmpi/src)
+TARGET_LINK_LIBRARIES (rmat ${example_LIBS})
-Index: mrmpi-20Jun11/mpistubs/CMakeLists.txt
+Index: mrmpi-1.0~20110620/mpistubs/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-20Jun11/mpistubs/CMakeLists.txt 2011-10-26 20:16:26.000000000 +0200
++++ mrmpi-1.0~20110620/mpistubs/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
@@ -0,0 +1,22 @@
+SET (mpistubs_SOURCES mpi.cpp)
+
@@ -57,10 +57,10 @@
+
+IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ INSTALL(TARGETS mpistubs
-+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
-+ RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-+ ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
++ EXPORT MyExport
++ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
++ ARCHIVE DESTINATION lib COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
+
+IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -69,10 +69,10 @@
+ DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/mrmpi
+ COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-Index: mrmpi-20Jun11/src/CMakeLists.txt
+Index: mrmpi-1.0~20110620/src/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-20Jun11/src/CMakeLists.txt 2011-10-26 20:16:40.000000000 +0200
++++ mrmpi-1.0~20110620/src/CMakeLists.txt 2011-10-26 20:51:35.000000000 +0200
@@ -0,0 +1,37 @@
+SET (mrmpi_SOURCES
+ mapreduce.cpp
@@ -92,9 +92,9 @@
+IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ INSTALL(TARGETS MapReduceMPI
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
-+ RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-+ ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
++ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
++ ARCHIVE DESTINATION lib COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
+
+IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -108,6 +108,6 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/mapreduce.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/memory.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mrmpi_config.h
-+ DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/mrmpi
++ DESTINATION include/mrmpi
+ COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
Modified: packages/mrmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/series?rev=43981&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/series (original)
+++ packages/mrmpi/trunk/debian/patches/series Wed Oct 26 18:54:30 2011
@@ -1,1 +1,3 @@
addcmake.patch
+tweakcmake.patch
+add_config.patch
Added: packages/mrmpi/trunk/debian/patches/tweakcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/tweakcmake.patch?rev=43981&op=file
==============================================================================
--- packages/mrmpi/trunk/debian/patches/tweakcmake.patch (added)
+++ packages/mrmpi/trunk/debian/patches/tweakcmake.patch Wed Oct 26 18:54:30 2011
@@ -1,0 +1,12 @@
+Index: mrmpi-1.0~20110620/CMakeLists.txt
+===================================================================
+--- mrmpi-1.0~20110620.orig/CMakeLists.txt 2011-10-26 20:44:38.000000000 +0200
++++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:44:48.000000000 +0200
+@@ -1,6 +1,7 @@
+ PROJECT (MAPREDUCE)
+
+ IF (VTK_USE_MPI)
++ find_package(MPI REQUIRED)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ADD_DEFINITIONS("-DMPICH_IGNORE_CXX_SEEK")
+ IF (MPI_LIBRARY)
Modified: packages/mrmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/rules?rev=43981&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/rules (original)
+++ packages/mrmpi/trunk/debian/rules Wed Oct 26 18:54:30 2011
@@ -6,6 +6,7 @@
CMAKE_FLAGS = \
-DCMAKE_BUILD_TYPE:STRING=RELEASE \
-DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
-DVTK_USE_MPI:BOOL=ON
pkg_run = mrmpi
More information about the debian-science-commits
mailing list