[Pkg-openmpi-commits] r270 - in /openmpi/trunk/debian: changelog control rules

[manuel at users.alioth.debian.org]

Author: manuel
Date: Wed Sep  1 16:10:30 2010
New Revision: 270

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=270
Log:
Build with support for Torque (except on HURD)

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=270&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Wed Sep  1 16:10:30 2010
@@ -3,9 +3,10 @@
   * Added patch to remove use of AS_VAR_GET. Closes: #592892.
   * debian/control: Added powerpcspe to architecture list. Thanks to
     Sebastian Andrzej Siewior for the patch! Closes: #593481.
+  * Build with support for Torque (except on HURD). Closes: #592887.
   * Updated Standards-Version to 3.9.1. No changes needed.
 
- -- Manuel Prinz <manuel at debian.org>  Wed, 01 Sep 2010 16:02:50 +0200
+ -- Manuel Prinz <manuel at debian.org>  Wed, 01 Sep 2010 17:53:44 +0200
 
 openmpi (1.4.2-3) unstable; urgency=low
 

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=270&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Wed Sep  1 16:10:30 2010
@@ -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 (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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
+Build-Depends: debhelper (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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
 Standards-Version: 3.9.1
 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=270&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Wed Sep  1 16:10:30 2010
@@ -27,7 +27,6 @@
 	CFLAGS += -mcpu=v9
 endif
 
-
 # BLCR checkpointing support
 BLCR_ARCH = "amd64 armel i386 powerpc"
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(BLCR_ARCH)))
@@ -38,6 +37,12 @@
 NUMA_ARCH = "amd64 i386 ia64 mips mipsel powerpc"
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(NUMA_ARCH)))
         NUMA = --with-libnuma=/usr --with-libnuma-libdir=/usr/lib
+endif
+
+# Torque support. Does not build on HURD currently,
+#   should be fine on all other arches.
+ifneq (hurd-i386,$(DEB_HOST_ARCH))
+	TORQUE=--with-tm
 endif
 
 COMMON_CONFIG_PARAMS = \
@@ -51,7 +56,8 @@
 			--libdir=\$${prefix}/lib/openmpi/lib	\
 			--includedir=\$${prefix}/lib/openmpi/include	\
 			--with-devel-headers \
-			--enable-heterogeneous
+			--enable-heterogeneous \
+			$(TORQUE)
 
 # Thread support disabled because it's broken, see bug #435581
 #                       --enable-mpi-threads                    \