[Pkg-scicomp-devel] parmetis/trunk

[Christophe Prud'homme]

SVN commit 1773 by prudhomm:

allow for openmpi

 M  +2 -2      parmetis/trunk/METISLib/Makefile  
 M  +5 -5      parmetis/trunk/Makefile.in  
 M  +2 -2      parmetis/trunk/ParMETISLib/Makefile  
 M  +6 -0      parmetis/trunk/debian/changelog  
 M  +2 -2      parmetis/trunk/debian/control  
 M  +2 -2      parmetis/trunk/debian/rules  


--- parmetis/trunk/METISLib/Makefile #1772:1773
@@ -33,7 +33,7 @@
 
 ../libmetis.so: $(SHLOBJS)
 	$(CC) -shared $^ -Wl,-soname,libmetis.so.3.1 -o $@.3.1 \
-	  $(LIBDIR) -lmpich
+	  $(LIBDIR) -lmpi
 	ln -s libmetis.so.3.1 $@
 
 clean:
@@ -47,7 +47,7 @@
 	@for file in *.[c,h]; \
 	do \
 	ci -u -m'Maintance' $$file;\
-	done 
+	done
 
 checkin2:
 	@for file in *.[c,h]; \
--- parmetis/trunk/Makefile.in #1772:1773
@@ -4,19 +4,19 @@
 
 
 # What optimization level to use
-OPTFLAGS = -O3 
+OPTFLAGS = -O3
 
 # Include directories for the compiler
-INCDIR = -I/usr/lib/mpich/include
+INCDIR =
 
 # What options to be used by the compiler
-COPTIONS = 
+COPTIONS =
 
 # Which loader to use
 LD = gcc
 
 # In which directories to look for any additional libraries
-LIBDIR = -L/usr/lib/mpich/lib/shared -L/usr/lib/mpich/lib
+LIBDIR =
 
 # What additional libraries to link the programs with (eg., -lmpi)
 #XTRALIBS = -lefence
@@ -29,4 +29,4 @@
 #RANLIB = ranlib
 RANLIB = ar -ts
 
-VERNUM = 
+VERNUM =
--- parmetis/trunk/ParMETISLib/Makefile #1772:1773
@@ -35,7 +35,7 @@
 
 ../libparmetis.so: $(SHLOBJS)
 	$(CC) -shared $^ -Wl,-soname,libparmetis.so.3.1 -o $@.3.1 \
-	  $(LIBDIR) -lmpich
+	  $(LIBDIR) -lmpi
 	ln -s libparmetis.so.3.1 $@
 
 clean:
@@ -49,7 +49,7 @@
 	@for file in *.[c,h]; \
 	do \
 	ci -u -m'Maintance' $$file;\
-	done 
+	done
 
 checkin2:
 	@for file in *.[c,h]; \
--- parmetis/trunk/debian/changelog #1772:1773
@@ -1,3 +1,9 @@
+parmetis (3.1-8) unstable; urgency=low
+
+  * debian/rules, debian/control: allow for openmpi and mpich
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Tue, 07 Aug 2007 16:41:27 +0200
+
 parmetis (3.1-7) unstable; urgency=low
 
   [Christophe Prud'homme]
--- parmetis/trunk/debian/control #1772:1773
@@ -6,12 +6,12 @@
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/parmetis/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/parmetis/
-Build-Depends: cdbs, debhelper (>= 5.0.0), libmpich1.0-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), libmpich1.0-dev|libopenmpi-dev
 
 Package: libparmetis-dev
 Architecture: any
 Section: non-free/libdevel
-Depends: libmpich1.0-dev, libparmetis3.1 (= ${Source-Version})
+Depends: libmpich1.0-dev|libopenmpi-dev, libparmetis3.1 (= ${Source-Version})
 Suggests: parmetis-doc
 Replaces: parmetis-dev
 Conflicts: parmetis-dev
--- parmetis/trunk/debian/rules #1772:1773
@@ -32,10 +32,10 @@
 INSTALL_PROG=install -D
 INSTALL_DATA=install -m 644 -D
 
-#DEB_MAKE_ENVVARS := 
+#DEB_MAKE_ENVVARS :=
 CFLAGS=-O3
 CXXFLAGS=-O3
-CPPFLAGS=-I/usr/lib/mpich/include -I. -I.. -I$(DEB_SRCDIR)
+CPPFLAGS=-I. -I.. -I$(DEB_SRCDIR)
 
 makebuilddir::
 	-ln -s METISLib metis