r46466 - in /packages/parms2/trunk/debian: patches/makefile.patch patches/parmetis.patch rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Jan 20 16:13:06 2014
New Revision: 46466

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46466
Log:
rebuild for libopenmpi1.6

Modified:
    packages/parms2/trunk/debian/patches/makefile.patch
    packages/parms2/trunk/debian/patches/parmetis.patch
    packages/parms2/trunk/debian/rules

Modified: packages/parms2/trunk/debian/patches/makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/makefile.patch?rev=46466&op=diff
==============================================================================
--- packages/parms2/trunk/debian/patches/makefile.patch	(original)
+++ packages/parms2/trunk/debian/patches/makefile.patch	Mon Jan 20 16:13:06 2014
@@ -1,7 +1,7 @@
-Index: parms2-2.2/makefile
+Index: parms2-2.2.dfsg/makefile
 ===================================================================
---- parms2-2.2.orig/makefile	2011-03-18 15:02:34.000000000 +0100
-+++ parms2-2.2/makefile	2011-03-18 15:02:35.000000000 +0100
+--- parms2-2.2.dfsg.orig/makefile	2014-01-20 16:38:57.736550009 +0100
++++ parms2-2.2.dfsg/makefile	2014-01-20 16:38:57.732549826 +0100
 @@ -4,7 +4,7 @@
  # TESTS/GRIDS or TESTS/GENERAL and see README files..
  include makefile.in
@@ -35,10 +35,10 @@
  .c.o:
  	$(CC) $(CFLAGS) $(MPI_INC) $< -c -o $@
  
-Index: parms2-2.2/makefile.in
+Index: parms2-2.2.dfsg/makefile.in
 ===================================================================
---- parms2-2.2.orig/makefile.in	2011-03-18 15:02:34.000000000 +0100
-+++ parms2-2.2/makefile.in	2011-03-18 15:04:32.000000000 +0100
+--- parms2-2.2.dfsg.orig/makefile.in	2014-01-20 16:38:57.736550009 +0100
++++ parms2-2.2.dfsg/makefile.in	2014-01-20 16:40:22.292428740 +0100
 @@ -7,11 +7,11 @@
  
  # variable to declare optimization level
@@ -61,10 +61,10 @@
 - INCLUDE_METIS =     -I$(HOME)/metis-4.0/Lib
 - METIS_HOME  =       -L$(HOME)/Libs
 + CFLAGS	=	$(DBG) $(DARCH) $(DCHNAME) -std=c99 -fPIC
-+ INCLUDE_METIS =     -I/usr/include/metis
-+ METIS_HOME  =       -lscotch
-+ INCLUDE_PARMETIS =     -I/usr/include/parmetis
-+ PARMETIS_HOME  =       -lscotch -lptscotch
++ INCLUDE_METIS =     -I/usr/include/scotch -I/usr/include/metis
++ METIS_HOME  =       -lscotch -lmetis
++ INCLUDE_PARMETIS =     -I/usr/include/scotch -I/usr/include/parmetis
++ PARMETIS_HOME  =       -lscotch -lptscotch -lparmetis
  
  # fortran compiler / linker 
   FC	=	mpif77

Modified: packages/parms2/trunk/debian/patches/parmetis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/patches/parmetis.patch?rev=46466&op=diff
==============================================================================
--- packages/parms2/trunk/debian/patches/parmetis.patch	(original)
+++ packages/parms2/trunk/debian/patches/parmetis.patch	Mon Jan 20 16:13:06 2014
@@ -1,13 +1,26 @@
-Index: parms2-2.2/TESTS/GENERAL/dd-HB-parmetis.c
+Index: parms2-2.2.dfsg/TESTS/GENERAL/dd-HB-parmetis.c
 ===================================================================
---- parms2-2.2.orig/TESTS/GENERAL/dd-HB-parmetis.c	2011-03-18 14:59:38.000000000 +0100
-+++ parms2-2.2/TESTS/GENERAL/dd-HB-parmetis.c	2011-03-18 14:59:54.000000000 +0100
-@@ -22,7 +22,7 @@
+--- parms2-2.2.dfsg.orig/TESTS/GENERAL/dd-HB-parmetis.c	2014-01-20 16:38:57.780552028 +0100
++++ parms2-2.2.dfsg/TESTS/GENERAL/dd-HB-parmetis.c	2014-01-20 16:38:57.776551844 +0100
+@@ -22,7 +22,8 @@
  #include "../../INCLUDE/psparslib.h"
  #include <stdlib.h>
  #include <string.h>
 -#include "../../../ParMetis-3.0/METISLib/metis.h"
++#include "ptscotch.h"
 +#include "parmetis.h"
  #define BUFLEN 100
  
  #if defined(SP2) || defined(RS6000)
+Index: parms2-2.2.dfsg/TESTS/GENERAL/dd-HB-metis.c
+===================================================================
+--- parms2-2.2.dfsg.orig/TESTS/GENERAL/dd-HB-metis.c	2014-01-20 16:38:44.731953464 +0100
++++ parms2-2.2.dfsg/TESTS/GENERAL/dd-HB-metis.c	2014-01-20 16:39:11.401176905 +0100
+@@ -18,6 +18,7 @@
+ #include "../../INCLUDE/psparslib.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include "scotch.h"
+ #include "metis.h"
+ #include "generaldefs.h"
+ #define BUFLEN 100

Modified: packages/parms2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/parms2/trunk/debian/rules?rev=46466&op=diff
==============================================================================
--- packages/parms2/trunk/debian/rules	(original)
+++ packages/parms2/trunk/debian/rules	Mon Jan 20 16:13:06 2014
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+export OMPI_MCA_orte_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
 # Add here any variable or target overrides you need.
 CFLAGS += -fPIC -DPETSC
@@ -40,3 +41,8 @@
 	-rm LIB/libparms2.*
 	-find . -name \*.ex | xargs -r rm
 	-rm -rf TESTS/OUTPUTS
+
+install/libparms2-test::
+	perl -pi -e "s|../../INCLUDE/psparslib.h|libparms2/psparslib.h|g" TESTS/GENERAL/*.c
+	perl -pi -e "s|../../INCLUDE/psparslib.h|libparms2/psparslib.h|g" TESTS/GRIDS/*.c
+