[Pkg-openmpi-commits] r374 - /openmpi/trunk/debian/patches/opal_thread_add64.patch

[mckinstry at users.alioth.debian.org]

Author: mckinstry
Date: Tue Mar  8 16:47:54 2016
New Revision: 374

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=374
Log:
Fix patch in one place; correct comments

Modified:
    openmpi/trunk/debian/patches/opal_thread_add64.patch

Modified: openmpi/trunk/debian/patches/opal_thread_add64.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/opal_thread_add64.patch?rev=374&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/opal_thread_add64.patch	(original)
+++ openmpi/trunk/debian/patches/opal_thread_add64.patch	Tue Mar  8 16:47:54 2016
@@ -1,31 +1,9 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- openmpi (1.10.2-8) unstable; urgency=medium
- .
-   * Don't ship opal.pc link that conflicts with libopal-dev. Closes: #814515
-   * openmpi-doc breaks/replaces openmpi-checkpoint (<< 1.10.2).
-     Closes: #814518.
 Author: Alastair McKinstry <mckinstry at debian.org>
-Bug-Debian: https://bugs.debian.org/814515
-Bug-Debian: https://bugs.debian.org/814518
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+Description: Fix for missing OPAL_THREAD_ADD64 on 32-bit platforms;
+ conditionally use OPAL_THREAD_ADD32 threre.
+Last-Updated: 2016-03-08
+Forwarded: yes
+Bug-Debian: https://bugs.debian.org/816303
 
 --- openmpi-1.10.2.orig/ompi/mca/btl/portals4/btl_portals4.c
 +++ openmpi-1.10.2/ompi/mca/btl/portals4/btl_portals4.c
@@ -102,7 +80,7 @@
 +#ifdef OPAL_HAVE_ATOMIC_MATH_64
      lock->serial_number = OPAL_THREAD_ADD64((int64_t *) &module->lock_serial_number, 1);
 +#else
-+    lock->serial_number = OPAL_THREAD_ADD64((int64_t *) &module->lock_serial_number, 1);
++    lock->serial_number = OPAL_THREAD_ADD32((int64_t *) &module->lock_serial_number, 1);
 +#endif
      lock->type = lock_type;
      lock->assert = assert;