[Pkg-openmpi-commits] r308 - in /openmpi/trunk/debian: changelog control patches/arm_detection.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Jun 25 12:23:10 2012
New Revision: 308

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=308
Log:
* Update the detection of armel & armhf (See arm_detection.diff)
* Add the dependency on hwloc-dev from libopenmpi1.6-dev (Closes: #677744)

Added:
    openmpi/trunk/debian/patches/arm_detection.diff
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control
    openmpi/trunk/debian/patches/series

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=308&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Jun 25 12:23:10 2012
@@ -1,3 +1,10 @@
+openmpi1.6 (1.6-2) unstable; urgency=low
+
+  * Update the detection of armel & armhf (See arm_detection.diff)
+  * Add the dependency on hwloc-dev from libopenmpi1.6-dev (Closes: #677744)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 25 Jun 2012 13:47:07 +0200
+
 openmpi1.6 (1.6-1) unstable; urgency=low
 
   * Sync from Ubuntu (which has been uploaded with a new name).

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=308&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Mon Jun 25 12:23:10 2012
@@ -40,7 +40,7 @@
 Package: libopenmpi1.6-dev
 Section: libdevel
 Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6 (= ${binary:Version}), openmpi1.6-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6 (= ${binary:Version}), openmpi1.6-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhwloc-dev
 Conflicts: openmpi-dev, libopenmpi-dev, openmpi-bin (<= 1.2.4-0)
 Description: high performance message passing library -- header files
  Open MPI is a project combining technologies and resources from several other

Added: openmpi/trunk/debian/patches/arm_detection.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/arm_detection.diff?rev=308&op=file
==============================================================================
--- openmpi/trunk/debian/patches/arm_detection.diff (added)
+++ openmpi/trunk/debian/patches/arm_detection.diff Mon Jun 25 12:23:10 2012
@@ -1,0 +1,20 @@
+--- openmpi1.6-1.6.back/opal/config/opal_config_asm.m4	2012-05-02 15:04:04.000000000 +0200
++++ openmpi1.6-1.6/opal/config/opal_config_asm.m4	2012-06-25 13:45:02.505752611 +0200
+@@ -900,7 +900,7 @@
+             OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
+             ;;
+ 
+-        armv7*)
++        armv7*|arm-*-linux-gnueabihf)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=1
+             OPAL_ASM_ARM_VERSION=7
+@@ -909,7 +909,7 @@
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+             ;;
+ 
+-        armv6*)
++        armv6*|arm-*-linux-gnueabi)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=308&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Mon Jun 25 12:23:10 2012
@@ -8,3 +8,4 @@
 #configure_arm_fix.patch
 # 658600: Regression of bug 531522
 #fix-fakeroot-execution.patch
+arm_detection.diff