[Pkg-openmpi-commits] r290 - in /openmpi/trunk/debian: changelog control libopenmpi2.lintian-overrides rules

[manuel at users.alioth.debian.org]

Author: manuel
Date: Tue Dec 20 23:19:44 2011
New Revision: 290

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=290
Log:
Build against libltdl and libhwloc provided by Debian

Removed:
    openmpi/trunk/debian/libopenmpi2.lintian-overrides
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=290&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Dec 20 23:19:44 2011
@@ -17,11 +17,12 @@
     - Fixed a small bug when calling dh_installdocs. Thanks to Jean-Louis Dupond
       for the patch! Closes: #634899.
     - Dropped .la files (no rdepends with .la files). Closes: #628070.
+    - Build against libltdl and libhwloc provided by Debian.
   * Acknowledge NMU. Thanks to Riku Voipio!
   * Builds support for GridEngine. Closes: #626164.
   * Enabled support for MPI threads. Closes: #602132.
 
- -- Manuel Prinz <manuel at debian.org>  Tue, 20 Dec 2011 19:59:50 +0100
+ -- Manuel Prinz <manuel at debian.org>  Wed, 21 Dec 2011 00:18:48 +0100
 
 openmpi (1.4.3-2.1) unstable; urgency=low
 

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=290&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Dec 20 23:19:44 2011
@@ -4,7 +4,7 @@
 Homepage: http://www.open-mpi.org/
 Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
 Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libtorque2-dev
+Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libhwloc-dev, libtorque2-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=290&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Tue Dec 20 23:19:44 2011
@@ -32,9 +32,11 @@
 	dh_auto_configure -- \
 		$(CHKPT) $(NUMA) $(TORQUE) \
 		$(MPI_THREADS) \
+		--with-hwloc=external \
+		--with-libltdl=external \
 		--with-devel-headers \
+		--with-sge \
 		--enable-heterogeneous \
-		--with-sge \
 		--disable-vt \
 		--sysconfdir=/etc/openmpi 		\
 		--libdir=\$${prefix}/lib/openmpi/lib	\