[Pkg-openmpi-commits] r300 - in /openmpi/tags/1.4.3-3: ./ debian/changelog debian/patches/arm_support

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Mar 29 18:11:35 2012
New Revision: 300

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=300
Log:
tag of the future version 1.4.3-3

Added:
    openmpi/tags/1.4.3-3/
      - copied from r299, openmpi/tags/1.4.3-2.1/
Modified:
    openmpi/tags/1.4.3-3/debian/changelog
    openmpi/tags/1.4.3-3/debian/patches/arm_support

Modified: openmpi/tags/1.4.3-3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/tags/1.4.3-3/debian/changelog?rev=300&op=diff
==============================================================================
--- openmpi/tags/1.4.3-3/debian/changelog (original)
+++ openmpi/tags/1.4.3-3/debian/changelog Thu Mar 29 18:11:35 2012
@@ -1,3 +1,9 @@
+openmpi (1.4.3-3) unstable; urgency=low
+
+  * Fails under arm. Thanks to Robie Basak (LP: #949044)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 29 Mar 2012 15:16:35 +0200
+
 openmpi (1.4.3-2.1) unstable; urgency=low
 
   * Non-maintainer upload

Modified: openmpi/tags/1.4.3-3/debian/patches/arm_support
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/tags/1.4.3-3/debian/patches/arm_support?rev=300&op=diff
==============================================================================
--- openmpi/tags/1.4.3-3/debian/patches/arm_support (original)
+++ openmpi/tags/1.4.3-3/debian/patches/arm_support Thu Mar 29 18:11:35 2012
@@ -255,7 +255,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ openmpi-1.4.3/opal/include/opal/sys/arm/timer.h	2011-01-06 14:49:50.000000000 +0200
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 + *                         University Research and Technology
@@ -279,12 +279,20 @@
 +
 +#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
 +
++#include <sys/times.h>
++
 +typedef uint64_t opal_timer_t;
 +
 +static inline opal_timer_t
 +opal_sys_timer_get_cycles(void)
 +{
-+    return 0;
++    opal_timer_t ret;
++    struct tms accurate_clock;
++
++    times(&accurate_clock);
++    ret = accurate_clock.tms_utime + accurate_clock.tms_stime;
++
++    return ret;
 +}
 +
 +#endif /* ! OMPI_SYS_ARCH_TIMER_H */