[Pkg-scicomp-devel] arpack/trunk/debian

[Daniel Leidert]

SVN commit 2263 by dleidert-guest:

* debian/control (Build-Depends): Use libopenmpi-dev on kfreebsd-i386,
  kfreebsd-amd64 and hurd-i386 too.
* debian/rules (build/libarpack2): Link with -lmpi_f77 on libopenmpi enabled
  architectures. Link with -larpack for svout and other functions used in
  libparapack.


 M  +4 -1      arpack/trunk/debian/changelog  
 M  +1 -1      arpack/trunk/debian/control  
 M  +7 -1      arpack/trunk/debian/rules  


--- arpack/trunk/debian/changelog #2262:2263
@@ -4,9 +4,12 @@
   * debian/arpack2-dev.doc-base (Section): Fixed accordingly to latest
     doc-base policy.
   * debian/libarpack2-dev.doc-base (Section): Ditto.
+  * debian/control (Build-Depends): Use libopenmpi-dev on kfreebsd-i386,
+    kfreebsd-amd64 and hurd-i386 too.
   * debian/rules (build/libarpack2): Build and link files in UTIL/ to avoid
     missing symbols (closes: #470415). Add -lgfortran to resolve gfortran
-    symbols.
+    symbols. Link with -lmpi_f77 on libopenmpi enabled architectures. Link
+    with -larpack for svout and other functions used in libparapack.
   * debian/patches/no_external_etime.patch: Added.
     - ARPACK/UTIL/second.f, UTIL/second.f: EXTERNAL for etime() is wrong here.
   * debian/patches/series: Adjusted.
--- arpack/trunk/debian/control #2262:2263
@@ -7,7 +7,7 @@
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>
 DM-Upload-Allowed: yes
 Build-Depends: quilt, cdbs, debhelper, gfortran, libblas-dev, liblapack-dev,
- libopenmpi-dev [i386 amd64 alpha ia64 powerpc sparc] | libmpich1.0-dev
+ libopenmpi-dev [alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386] | libmpich1.0-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/arpack/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/arpack/
--- arpack/trunk/debian/rules #2262:2263
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+OPENMPI_ARCH = alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
+
 #DEB_TAR_SRCDIR                  := suitesparse-1.2
 
 include /usr/share/cdbs/1/class/makefile.mk
@@ -24,6 +26,10 @@
  CFLAGS+=-m64
 endif
 
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OPENMPI_ARCH)))
+ openmpilib = -lmpi_f77
+endif
+
 package=arpack
 
 version=2.1 #$(shell expr `pwd` : '.*-\([0-9.]*\)')
@@ -39,7 +45,7 @@
 	-(cd objs && ar rv lib$(package).a `ls *.o`; ranlib lib$(package).a )
 	-(cd pobjs && $(MAKE) -f ../PARPACK/UTIL/MPI/Makefile VPATH="../PARPACK/UTIL/MPI/" srcdir="../PARPACK/UTIL/MPI/" FFLAGS="-O3 -fPIC -pipe" single double complex complex16; )
 	-(cd pobjs && $(MAKE) -f ../PARPACK/SRC/MPI/Makefile VPATH="../PARPACK/SRC/MPI/" srcdir="../PARPACK/SRC/MPI/" FFLAGS="-O3 -fPIC -pipe" single double complex complex16; )
-	-(cd pobjs && gcc -shared -Wl,-soname,libp$(package).so.$(version_major) -o libp$(package).so.$(version) `ls *.o`  -L/usr/lib/atlas -llapack -lblas -lmpi -lm -lgfortran)
+	-(cd pobjs && gcc -shared -Wl,-soname,libp$(package).so.$(version_major) -o libp$(package).so.$(version) `ls *.o`  -L/usr/lib/atlas -llapack -lblas -lmpi $(openmpilib) -lm -lgfortran -L../objs -l$(package) )
 	-(cd pobjs && ln -sf libp$(package).so.$(version) libp$(package).so.$(version_major) )
 	-(cd pobjs && ln -sf libp$(package).so.$(version) libp$(package).so )
 	-(cd pobjs && ar rv libp$(package).a `ls *.o`; ranlib libp$(package).a )