[Pkg-openmpi-commits] r388 - in /openmpi/trunk/debian: ./ patches/
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Tue Jun 21 12:46:06 UTC 2016
Author: mckinstry
Date: Tue Jun 21 12:46:06 2016
New Revision: 388
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=388
Log:
1.10.3-3
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/control
openmpi/trunk/debian/libopenmpi1.10.install
openmpi/trunk/debian/libopenmpi1.10.links
openmpi/trunk/debian/patches/alpha_badatomic.patch
openmpi/trunk/debian/patches/arm_detection.diff
openmpi/trunk/debian/patches/basic-arm64-support.diff
openmpi/trunk/debian/patches/build_hurd
openmpi/trunk/debian/patches/fix-man-pages.patch
openmpi/trunk/debian/patches/hppa.patch
openmpi/trunk/debian/patches/manpage_macros
openmpi/trunk/debian/patches/mips-detection.diff
openmpi/trunk/debian/patches/mpi_win.patch
openmpi/trunk/debian/patches/opal_thread_add64.patch
openmpi/trunk/debian/patches/reproducible-build.patch
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/patches/x32.patch
openmpi/trunk/debian/rules
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Jun 21 12:46:06 2016
@@ -1,3 +1,33 @@
+openmpi (1.10.3-3) unstable; urgency=medium
+
+ * Fix libmca_common_verbs 7.0.0 -> 7.0.1
+ * lenny Breaks: add version to libopenmpi1.4
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 21 Jun 2016 13:00:37 +0100
+
+openmpi (1.10.3-2) unstable; urgency=medium
+
+ Fix missing shlib version change:
+ * _tkr moved from 6.1.1 -> 6.2.0
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 16 Jun 2016 12:46:06 +0100
+
+openmpi (1.10.3-1) unstable; urgency=medium
+
+ * New upstream release
+ - patch opal_thread_add64.patch merged upstream
+ - mpi_win.patch merged upstream
+ * Shlib version changes:
+ - libmpi 12.0.2 -> 12.0.3
+ - libmpi_mpifh 12.0.0 -> 12.0.1
+ - libmpi_usempif08 11.1.0 -> 11.1.1
+ - libmpi_usempi_ignore_tkr 6.1.0 -> 6.2.0
+ - libopen-pal 13.0.2 -> 13.0.3
+ - libopen-rte.so 12.0.2 -> 12.0.3
+ - liboshmem.so 8.1.0 -> 8.1.1
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 16 Jun 2016 07:12:57 +0100
+
openmpi (1.10.2-15) unstable; urgency=medium
* Regression: liboshmem.so.8.1.0 not shipped. Closes: #825575
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Jun 21 12:46:06 2016
@@ -67,8 +67,8 @@
Recommends: openmpi-bin
Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc-plugins
Conflicts: libopenmpi1.6
-Breaks: libopenmpi-1
-Replaces: libopenmpi1
+Breaks: libopenmpi1.4 (>= 1.4.5-1)
+Replaces: libopenmpi1.4
Description: high performance message passing library -- shared library
Open MPI is a project combining technologies and resources from several other
projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
Modified: openmpi/trunk/debian/libopenmpi1.10.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.10.install?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.10.install (original)
+++ openmpi/trunk/debian/libopenmpi1.10.install Tue Jun 21 12:46:06 2016
@@ -1,14 +1,14 @@
## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.4.0.4
usr/lib/openmpi/lib/libmpi_cxx.so.1.1.3
-usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.0
-usr/lib/openmpi/lib/libmpi.so.12.0.2
-usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.0
-usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.1.0
+usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.1
+usr/lib/openmpi/lib/libmpi.so.12.0.3
+usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.1
+usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.2.0
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.13.0.2
-usr/lib/openmpi/lib/libopen-rte.so.12.0.2
-/usr/lib/openmpi/lib/liboshmem.so.8.1.0
+usr/lib/openmpi/lib/libopen-pal.so.13.0.3
+usr/lib/openmpi/lib/libopen-rte.so.12.0.3
+/usr/lib/openmpi/lib/liboshmem.so.8.1.1
## Plugins
usr/lib/openmpi/lib/openmpi/*.so
## Other files
Modified: openmpi/trunk/debian/libopenmpi1.10.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.10.links?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.10.links (original)
+++ openmpi/trunk/debian/libopenmpi1.10.links Tue Jun 21 12:46:06 2016
@@ -1,24 +1,24 @@
# Compatibility links to /usr/bin
usr/lib/openmpi/lib/libmca_common_sm.so.4.0.4 usr/lib/libmca_common_sm.so.4.0.4
-usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 usr/lib/libmca_common_verbs.so.7.0.0
+usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.1 usr/lib/libmca_common_verbs.so.7.0.1
usr/lib/openmpi/lib/libmpi_cxx.so.1.1.3 usr/lib/libmpi_cxx.so.1.1.3
-usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.0 usr/lib/libmpi_mpifh.so.12.0.0
-usr/lib/openmpi/lib/libmpi.so.12.0.2 usr/lib/libmpi.so.12.0.2
-usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so.11.1.0
-usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0
+usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.1 usr/lib/libmpi_mpifh.so.12.0.1
+usr/lib/openmpi/lib/libmpi.so.12.0.3 usr/lib/libmpi.so.12.0.3
+usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.1 usr/lib/libmpi_usempif08.so.11.1.1
+usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.2.0 usr/lib/libmpi_usempi_ignore_tkr.so.6.2.0
usr/lib/openmpi/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.13.0.2 usr/lib/libopen-pal.so.13.0.2
-usr/lib/openmpi/lib/libopen-rte.so.12.0.2 usr/lib/libopen-rte.so.12.0.2
-usr/lib/openmpi/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so.8.1.0
+usr/lib/openmpi/lib/libopen-pal.so.13.0.3 usr/lib/libopen-pal.so.13.0.3
+usr/lib/openmpi/lib/libopen-rte.so.12.0.3 usr/lib/libopen-rte.so.12.0.3
+usr/lib/openmpi/lib/liboshmem.so.8.1.1 usr/lib/liboshmem.so.8.1.1
# SONAME symlinks
usr/lib/libmca_common_sm.so.4.0.4 usr/lib/libmca_common_sm.so.4
-usr/lib/libmca_common_verbs.so.7.0.0 usr/lib/libmca_common_verbs.so.7
+usr/lib/libmca_common_verbs.so.7.0.1 usr/lib/libmca_common_verbs.so.7
usr/lib/libmpi_cxx.so.1.1.3 usr/lib/libmpi_cxx.so.1
-usr/lib/libmpi_mpifh.so.12.0.0 usr/lib/libmpi_mpifh.so.12
-usr/lib/libmpi.so.12.0.2 usr/lib/libmpi.so.12
-usr/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so.11
-usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so.6
+usr/lib/libmpi_mpifh.so.12.0.1 usr/lib/libmpi_mpifh.so.12
+usr/lib/libmpi.so.12.0.3 usr/lib/libmpi.so.12
+usr/lib/libmpi_usempif08.so.11.1.1 usr/lib/libmpi_usempif08.so.11
+usr/lib/libmpi_usempi_ignore_tkr.so.6.2.0 usr/lib/libmpi_usempi_ignore_tkr.so.6
usr/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0
-usr/lib/libopen-pal.so.13.0.2 usr/lib/libopen-pal.so.13
-usr/lib/libopen-rte.so.12.0.2 usr/lib/libopen-rte.so.12
-usr/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so.8
+usr/lib/libopen-pal.so.13.0.3 usr/lib/libopen-pal.so.13
+usr/lib/libopen-rte.so.12.0.3 usr/lib/libopen-rte.so.12
+usr/lib/liboshmem.so.8.1.1 usr/lib/liboshmem.so.8
Modified: openmpi/trunk/debian/patches/alpha_badatomic.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/alpha_badatomic.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/alpha_badatomic.patch (original)
+++ openmpi/trunk/debian/patches/alpha_badatomic.patch Tue Jun 21 12:46:06 2016
@@ -1,7 +1,7 @@
-Index: openmpi-1.10.2/opal/include/opal/sys/alpha/atomic.h
+Index: openmpi-1.10.3/opal/include/opal/sys/alpha/atomic.h
===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/alpha/atomic.h
-+++ openmpi-1.10.2/opal/include/opal/sys/alpha/atomic.h
+--- openmpi-1.10.3.orig/opal/include/opal/sys/alpha/atomic.h
++++ openmpi-1.10.3/opal/include/opal/sys/alpha/atomic.h
@@ -96,9 +96,7 @@ static inline int opal_atomic_cmpset_32(
"mov %3, %0 \n\t"
"stl_c %0, %1 \n\t"
Modified: openmpi/trunk/debian/patches/arm_detection.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/arm_detection.diff?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/arm_detection.diff (original)
+++ openmpi/trunk/debian/patches/arm_detection.diff Tue Jun 21 12:46:06 2016
@@ -1,8 +1,8 @@
-Index: openmpi-1.10.2/configure
+Index: openmpi-1.10.3/configure
===================================================================
---- openmpi-1.10.2.orig/configure
-+++ openmpi-1.10.2/configure
-@@ -31355,7 +31355,7 @@ _ACEOF
+--- openmpi-1.10.3.orig/configure
++++ openmpi-1.10.3/configure
+@@ -31369,7 +31369,7 @@ _ACEOF
OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
;;
@@ -11,7 +11,7 @@
ompi_cv_asm_arch="ARM"
OPAL_ASM_SUPPORT_64BIT=1
OPAL_ASM_ARM_VERSION=7
-@@ -31380,7 +31380,7 @@ _ACEOF
+@@ -31394,7 +31394,7 @@ _ACEOF
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -20,10 +20,10 @@
# uses Linux kernel helpers for some atomic operations
ompi_cv_asm_arch="ARM"
OPAL_ASM_SUPPORT_64BIT=0
-Index: openmpi-1.10.2/config/opal_config_asm.m4
+Index: openmpi-1.10.3/config/opal_config_asm.m4
===================================================================
---- openmpi-1.10.2.orig/config/opal_config_asm.m4
-+++ openmpi-1.10.2/config/opal_config_asm.m4
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
@@ -817,7 +817,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
;;
Modified: openmpi/trunk/debian/patches/basic-arm64-support.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/basic-arm64-support.diff?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/basic-arm64-support.diff (original)
+++ openmpi/trunk/debian/patches/basic-arm64-support.diff Tue Jun 21 12:46:06 2016
@@ -15,10 +15,10 @@
create mode 100644 opal/include/opal/sys/arm64/atomic.h
create mode 100644 opal/include/opal/sys/arm64/timer.h
-Index: openmpi-1.10.2/opal/include/opal/sys/Makefile.am
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/Makefile.am
-+++ openmpi-1.10.2/opal/include/opal/sys/Makefile.am
+Index: openmpi-1.10.3/opal/include/opal/sys/Makefile.am
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/Makefile.am
++++ openmpi-1.10.3/opal/include/opal/sys/Makefile.am
@@ -30,6 +30,7 @@ headers += \
include opal/sys/alpha/Makefile.am
include opal/sys/amd64/Makefile.am
@@ -27,10 +27,10 @@
include opal/sys/ia32/Makefile.am
include opal/sys/ia64/Makefile.am
include opal/sys/mips/Makefile.am
-Index: openmpi-1.10.2/opal/include/opal/sys/arm64/Makefile.am
+Index: openmpi-1.10.3/opal/include/opal/sys/arm64/Makefile.am
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/arm64/Makefile.am
++++ openmpi-1.10.3/opal/include/opal/sys/arm64/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -56,10 +56,10 @@
+ opal/sys/arm64/atomic.h \
+ opal/sys/arm64/timer.h
+
-Index: openmpi-1.10.2/opal/include/opal/sys/arm64/atomic.h
+Index: openmpi-1.10.3/opal/include/opal/sys/arm64/atomic.h
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/arm64/atomic.h
++++ openmpi-1.10.3/opal/include/opal/sys/arm64/atomic.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -230,10 +230,10 @@
+}
+
+#endif /* ! OMPI_SYS_ARCH_ATOMIC_H */
-Index: openmpi-1.10.2/opal/include/opal/sys/arm64/timer.h
+Index: openmpi-1.10.3/opal/include/opal/sys/arm64/timer.h
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/arm64/timer.h
++++ openmpi-1.10.3/opal/include/opal/sys/arm64/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008 The University of Tennessee and The University
@@ -268,10 +268,10 @@
+#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* ! OMPI_SYS_ARCH_TIMER_H */
-Index: openmpi-1.10.2/opal/include/opal/sys/atomic.h
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/atomic.h
-+++ openmpi-1.10.2/opal/include/opal/sys/atomic.h
+Index: openmpi-1.10.3/opal/include/opal/sys/atomic.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/atomic.h
++++ openmpi-1.10.3/opal/include/opal/sys/atomic.h
@@ -152,6 +152,8 @@ typedef struct opal_atomic_lock_t opal_a
#include "opal/sys/amd64/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_ARM
@@ -281,11 +281,11 @@
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA32
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
-Index: openmpi-1.10.2/opal/include/opal/sys/timer.h
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/timer.h
-+++ openmpi-1.10.2/opal/include/opal/sys/timer.h
-@@ -81,6 +81,8 @@ BEGIN_C_DECLS
+Index: openmpi-1.10.3/opal/include/opal/sys/timer.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/timer.h
++++ openmpi-1.10.3/opal/include/opal/sys/timer.h
+@@ -84,6 +84,8 @@ BEGIN_C_DECLS
#include "opal/sys/amd64/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_ARM
#include "opal/sys/arm/timer.h"
@@ -294,10 +294,10 @@
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA32
#include "opal/sys/ia32/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
-Index: openmpi-1.10.2/config/opal_config_asm.m4
-===================================================================
---- openmpi-1.10.2.orig/config/opal_config_asm.m4
-+++ openmpi-1.10.2/config/opal_config_asm.m4
+Index: openmpi-1.10.3/config/opal_config_asm.m4
+===================================================================
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
@@ -817,6 +817,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
;;
Modified: openmpi/trunk/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/build_hurd?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/build_hurd (original)
+++ openmpi/trunk/debian/patches/build_hurd Tue Jun 21 12:46:06 2016
@@ -7,10 +7,10 @@
Forwarded: partially
Last-Update: 2013-08-21
-Index: openmpi-1.10.2/ompi/runtime/ompi_mpi_abort.c
-===================================================================
---- openmpi-1.10.2.orig/ompi/runtime/ompi_mpi_abort.c
-+++ openmpi-1.10.2/ompi/runtime/ompi_mpi_abort.c
+Index: openmpi-1.10.3/ompi/runtime/ompi_mpi_abort.c
+===================================================================
+--- openmpi-1.10.3.orig/ompi/runtime/ompi_mpi_abort.c
++++ openmpi-1.10.3/ompi/runtime/ompi_mpi_abort.c
@@ -50,10 +50,11 @@ ompi_mpi_abort(struct ompi_communicator_
bool kill_remote_of_intercomm)
{
@@ -39,10 +39,10 @@
}
pid = getpid();
-Index: openmpi-1.10.2/ompi/runtime/ompi_mpi_finalize.c
-===================================================================
---- openmpi-1.10.2.orig/ompi/runtime/ompi_mpi_finalize.c
-+++ openmpi-1.10.2/ompi/runtime/ompi_mpi_finalize.c
+Index: openmpi-1.10.3/ompi/runtime/ompi_mpi_finalize.c
+===================================================================
+--- openmpi-1.10.3.orig/ompi/runtime/ompi_mpi_finalize.c
++++ openmpi-1.10.3/ompi/runtime/ompi_mpi_finalize.c
@@ -106,13 +106,18 @@ int ompi_mpi_finalize(void)
/* Note that if we're already finalized, we cannot raise an
MPI exception. The best that we can do is write something
@@ -64,10 +64,10 @@
return MPI_ERR_OTHER;
}
-Index: openmpi-1.10.2/opal/util/stacktrace.c
-===================================================================
---- openmpi-1.10.2.orig/opal/util/stacktrace.c
-+++ openmpi-1.10.2/opal/util/stacktrace.c
+Index: openmpi-1.10.3/opal/util/stacktrace.c
+===================================================================
+--- openmpi-1.10.3.orig/opal/util/stacktrace.c
++++ openmpi-1.10.3/opal/util/stacktrace.c
@@ -442,8 +442,12 @@ int opal_util_register_stackhandlers (vo
}
@@ -81,10 +81,10 @@
#ifdef SA_ONESHOT
act.sa_flags |= SA_ONESHOT;
#else
-Index: openmpi-1.10.2/orte/mca/odls/base/odls_base_default_fns.c
-===================================================================
---- openmpi-1.10.2.orig/orte/mca/odls/base/odls_base_default_fns.c
-+++ openmpi-1.10.2/orte/mca/odls/base/odls_base_default_fns.c
+Index: openmpi-1.10.3/orte/mca/odls/base/odls_base_default_fns.c
+===================================================================
+--- openmpi-1.10.3.orig/orte/mca/odls/base/odls_base_default_fns.c
++++ openmpi-1.10.3/orte/mca/odls/base/odls_base_default_fns.c
@@ -1109,7 +1109,12 @@ void orte_odls_base_default_launch_local
bool oversubscribed;
int rc=ORTE_SUCCESS;
@@ -110,7 +110,7 @@
/* find the jobdat for this job */
if (NULL == (jobdat = orte_get_job_data_object(job))) {
-@@ -2385,8 +2394,13 @@ int orte_odls_base_default_restart_proc(
+@@ -2398,8 +2407,13 @@ int orte_odls_base_default_restart_proc(
int rc;
orte_app_context_t *app;
orte_job_t *jobdat;
@@ -125,7 +125,7 @@
OPAL_OUTPUT_VERBOSE((5, orte_odls_base_framework.framework_output,
"%s odls:restart_proc for proc %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
-@@ -2396,7 +2410,11 @@ int orte_odls_base_default_restart_proc(
+@@ -2409,7 +2423,11 @@ int orte_odls_base_default_restart_proc(
* bouncing around as we execute this app, but we will always return
* to this place as our default directory
*/
@@ -137,10 +137,10 @@
/* find this child's jobdat */
if (NULL == (jobdat = orte_get_job_data_object(child->name.jobid))) {
-Index: openmpi-1.10.2/opal/mca/shmem/mmap/shmem_mmap_module.c
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/shmem/mmap/shmem_mmap_module.c
-+++ openmpi-1.10.2/opal/mca/shmem/mmap/shmem_mmap_module.c
+Index: openmpi-1.10.3/opal/mca/shmem/mmap/shmem_mmap_module.c
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/shmem/mmap/shmem_mmap_module.c
++++ openmpi-1.10.3/opal/mca/shmem/mmap/shmem_mmap_module.c
@@ -62,6 +62,10 @@
/* for tons of debug output: -mca shmem_base_verbose 70 */
@@ -152,10 +152,10 @@
/* ////////////////////////////////////////////////////////////////////////// */
/*local functions */
/* local functions */
-Index: openmpi-1.10.2/opal/mca/shmem/posix/shmem_posix_common_utils.h
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/shmem/posix/shmem_posix_common_utils.h
-+++ openmpi-1.10.2/opal/mca/shmem/posix/shmem_posix_common_utils.h
+Index: openmpi-1.10.3/opal/mca/shmem/posix/shmem_posix_common_utils.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/shmem/posix/shmem_posix_common_utils.h
++++ openmpi-1.10.3/opal/mca/shmem/posix/shmem_posix_common_utils.h
@@ -45,6 +45,10 @@ BEGIN_C_DECLS
OPAL_DECLSPEC extern int shmem_posix_shm_open(char *posix_file_name_buff,
size_t size);
@@ -167,10 +167,10 @@
END_C_DECLS
#endif /* OPAL_SHMEM_POSIX_COMMON_UTILS_H */
-Index: openmpi-1.10.2/opal/mca/shmem/sysv/shmem_sysv_module.c
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/shmem/sysv/shmem_sysv_module.c
-+++ openmpi-1.10.2/opal/mca/shmem/sysv/shmem_sysv_module.c
+Index: openmpi-1.10.3/opal/mca/shmem/sysv/shmem_sysv_module.c
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/shmem/sysv/shmem_sysv_module.c
++++ openmpi-1.10.3/opal/mca/shmem/sysv/shmem_sysv_module.c
@@ -64,6 +64,10 @@
/* for tons of debug output: -mca shmem_base_verbose 70 */
@@ -182,25 +182,25 @@
/* ////////////////////////////////////////////////////////////////////////// */
/* local functions */
static int
-Index: openmpi-1.10.2/opal/mca/memory/linux/configure.m4
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/memory/linux/configure.m4
-+++ openmpi-1.10.2/opal/mca/memory/linux/configure.m4
-@@ -61,6 +61,10 @@ AC_DEFUN([MCA_opal_memory_linux_CONFIG],
- [memory_linux_ptmalloc2_happy=no
+Index: openmpi-1.10.3/opal/mca/memory/linux/configure.m4
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/memory/linux/configure.m4
++++ openmpi-1.10.3/opal/mca/memory/linux/configure.m4
+@@ -62,6 +62,10 @@ AC_DEFUN([MCA_opal_memory_linux_CONFIG],
memory_linux_ummu_happy=no])])
+
+ AS_IF([echo "$host_os" | grep '^gnu' >/dev/null 2>/dev/null],
+ [memory_linux_ptmalloc2_happy=no
+ memory_linux_ummu_happy=no])
+
######################################################################
- # ptmalloc2
+ # if memory hook available
######################################################################
-Index: openmpi-1.10.2/opal/mca/base/mca_base_component_find.c
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/base/mca_base_component_find.c
-+++ openmpi-1.10.2/opal/mca/base/mca_base_component_find.c
+Index: openmpi-1.10.3/opal/mca/base/mca_base_component_find.c
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/base/mca_base_component_find.c
++++ openmpi-1.10.3/opal/mca/base/mca_base_component_find.c
@@ -992,11 +992,16 @@ static int component_find_check (const c
}
@@ -220,10 +220,10 @@
return OPAL_ERR_NOT_FOUND;
}
}
-Index: openmpi-1.10.2/ompi/include/ompi_config.h
-===================================================================
---- openmpi-1.10.2.orig/ompi/include/ompi_config.h
-+++ openmpi-1.10.2/ompi/include/ompi_config.h
+Index: openmpi-1.10.3/ompi/include/ompi_config.h
+===================================================================
+--- openmpi-1.10.3.orig/ompi/include/ompi_config.h
++++ openmpi-1.10.3/ompi/include/ompi_config.h
@@ -26,6 +26,10 @@
#include "opal_config.h"
@@ -235,10 +235,10 @@
#define OMPI_IDENT_STRING OPAL_IDENT_STRING
/***********************************************************************
-Index: openmpi-1.10.2/opal/mca/base/mca_base_var.c
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/base/mca_base_var.c
-+++ openmpi-1.10.2/opal/mca/base/mca_base_var.c
+Index: openmpi-1.10.3/opal/mca/base/mca_base_var.c
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/base/mca_base_var.c
++++ openmpi-1.10.3/opal/mca/base/mca_base_var.c
@@ -50,6 +50,14 @@
#include "opal/util/opal_environ.h"
#include "opal/runtime/opal.h"
@@ -254,28 +254,28 @@
/*
* local variables
*/
-Index: openmpi-1.10.2/orte/include/orte_config.h.in
-===================================================================
---- openmpi-1.10.2.orig/orte/include/orte_config.h.in
-+++ openmpi-1.10.2/orte/include/orte_config.h.in
+Index: openmpi-1.10.3/orte/include/orte_config.h.in
+===================================================================
+--- openmpi-1.10.3.orig/orte/include/orte_config.h.in
++++ openmpi-1.10.3/orte/include/orte_config.h.in
@@ -24,6 +24,10 @@
#ifndef ORTE_CONFIG_H
#define ORTE_CONFIG_H
-
+
+#ifndef PATH_MAX
+#define PATH_MAX 65535
+#endif
+
#include "opal_config.h"
-
+
#define ORTE_IDENT_STRING OPAL_IDENT_STRING
-Index: openmpi-1.10.2/test/util/opal_path_nfs.c
-===================================================================
---- openmpi-1.10.2.orig/test/util/opal_path_nfs.c
-+++ openmpi-1.10.2/test/util/opal_path_nfs.c
+Index: openmpi-1.10.3/test/util/opal_path_nfs.c
+===================================================================
+--- openmpi-1.10.3.orig/test/util/opal_path_nfs.c
++++ openmpi-1.10.3/test/util/opal_path_nfs.c
@@ -31,8 +31,10 @@
#include <dirent.h>
-
+
#include <sys/param.h>
+#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
Modified: openmpi/trunk/debian/patches/fix-man-pages.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/fix-man-pages.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/fix-man-pages.patch (original)
+++ openmpi/trunk/debian/patches/fix-man-pages.patch Tue Jun 21 12:46:06 2016
@@ -3,10 +3,10 @@
Last-Updated: 2016-02-07
Forwarded: no
-Index: openmpi-1.10.2/ompi/mpi/man/man3/MPI_Get.3in
+Index: openmpi-1.10.3/ompi/mpi/man/man3/MPI_Get.3in
===================================================================
---- openmpi-1.10.2.orig/ompi/mpi/man/man3/MPI_Get.3in
-+++ openmpi-1.10.2/ompi/mpi/man/man3/MPI_Get.3in
+--- openmpi-1.10.3.orig/ompi/mpi/man/man3/MPI_Get.3in
++++ openmpi-1.10.3/ompi/mpi/man/man3/MPI_Get.3in
@@ -79,7 +79,7 @@ window object used for communication (ha
.SH OUTPUT PARAMETER
@@ -16,10 +16,10 @@
request
MPI_Rget: RMA request
.TP 1i
-Index: openmpi-1.10.2/ompi/mpi/man/man3/MPI_Put.3in
+Index: openmpi-1.10.3/ompi/mpi/man/man3/MPI_Put.3in
===================================================================
---- openmpi-1.10.2.orig/ompi/mpi/man/man3/MPI_Put.3in
-+++ openmpi-1.10.2/ompi/mpi/man/man3/MPI_Put.3in
+--- openmpi-1.10.3.orig/ompi/mpi/man/man3/MPI_Put.3in
++++ openmpi-1.10.3/ompi/mpi/man/man3/MPI_Put.3in
@@ -98,7 +98,7 @@ The communication must satisfy the same
.sp
The \fItarget_datatype\fP argument is a handle to a datatype object defined at the origin process. However, this object is interpreted at the target process: The outcome is as if the target datatype object were defined at the target process, by the same sequence of calls used to define it at the origin process. The target data type must contain only relative displacements, not absolute addresses. The same holds for get and accumulate.
@@ -29,20 +29,20 @@
.SH NOTES
The \fItarget_datatype\fP argument is a handle to a datatype object that is defined at the origin process, even though it defines a data layout in the target process memory. This does not cause problems in a homogeneous or heterogeneous environment, as long as only portable data types are used (portable data types are defined in Section 2.4 of the MPI-2 Standard).
-Index: openmpi-1.10.2/orte/tools/orte-dvm/orte-dvm.1in
+Index: openmpi-1.10.3/orte/tools/orte-dvm/orte-dvm.1in
===================================================================
---- openmpi-1.10.2.orig/orte/tools/orte-dvm/orte-dvm.1in
-+++ openmpi-1.10.2/orte/tools/orte-dvm/orte-dvm.1in
+--- openmpi-1.10.3.orig/orte/tools/orte-dvm/orte-dvm.1in
++++ openmpi-1.10.3/orte/tools/orte-dvm/orte-dvm.1in
@@ -1,4 +1,4 @@
-.\†-*- nroff -*-
+.\" -*- nroff -*-
.\" Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
.\" Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
.\†Copyright (c) 2015 Intel, Inc. All rights reserved
-Index: openmpi-1.10.2/orte/tools/orte-submit/orte-submit.1in
+Index: openmpi-1.10.3/orte/tools/orte-submit/orte-submit.1in
===================================================================
---- openmpi-1.10.2.orig/orte/tools/orte-submit/orte-submit.1in
-+++ openmpi-1.10.2/orte/tools/orte-submit/orte-submit.1in
+--- openmpi-1.10.3.orig/orte/tools/orte-submit/orte-submit.1in
++++ openmpi-1.10.3/orte/tools/orte-submit/orte-submit.1in
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\" Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
Modified: openmpi/trunk/debian/patches/hppa.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/hppa.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/hppa.patch (original)
+++ openmpi/trunk/debian/patches/hppa.patch Tue Jun 21 12:46:06 2016
@@ -4,10 +4,10 @@
Last-Updated: 2016-01-23
Forwarded: no
-Index: openmpi-1.10.2/config/opal_config_asm.m4
-===================================================================
---- openmpi-1.10.2.orig/config/opal_config_asm.m4
-+++ openmpi-1.10.2/config/opal_config_asm.m4
+Index: openmpi-1.10.3/config/opal_config_asm.m4
+===================================================================
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
@@ -853,6 +853,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -21,10 +21,10 @@
mips-*|mipsel-*)
ompi_cv_asm_arch="MIPS"
OPAL_ASM_SUPPORT_64BIT=0
-Index: openmpi-1.10.2/opal/include/opal/sys/architecture.h
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/architecture.h
-+++ openmpi-1.10.2/opal/include/opal/sys/architecture.h
+Index: openmpi-1.10.3/opal/include/opal/sys/architecture.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/architecture.h
++++ openmpi-1.10.3/opal/include/opal/sys/architecture.h
@@ -38,6 +38,7 @@
#define OMPI_SPARCV9_64 0062
#define OMPI_MIPS 0070
@@ -33,10 +33,10 @@
#define OMPI_BUILTIN_SYNC 0200
#define OMPI_BUILTIN_OSX 0201
#define OMPI_BUILTIN_NO 0202
-Index: openmpi-1.10.2/opal/include/opal/sys/atomic.h
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/atomic.h
-+++ openmpi-1.10.2/opal/include/opal/sys/atomic.h
+Index: openmpi-1.10.3/opal/include/opal/sys/atomic.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/atomic.h
++++ openmpi-1.10.3/opal/include/opal/sys/atomic.h
@@ -158,6 +158,8 @@ typedef struct opal_atomic_lock_t opal_a
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
@@ -46,10 +46,10 @@
#elif OPAL_ASSEMBLY_ARCH == OMPI_MIPS
#include "opal/sys/mips/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_POWERPC32
-Index: openmpi-1.10.2/opal/include/opal/sys/hppa/atomic.h
+Index: openmpi-1.10.3/opal/include/opal/sys/hppa/atomic.h
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/hppa/atomic.h
++++ openmpi-1.10.3/opal/include/opal/sys/hppa/atomic.h
@@ -0,0 +1,95 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
@@ -146,10 +146,10 @@
+#define OPAL_HAVE_ATOMIC_CMPSET_64 0
+
+#endif /* ! OPAL_SYS_ARCH_ATOMIC_H */
-Index: openmpi-1.10.2/opal/include/opal/sys/hppa/Makefile.am
+Index: openmpi-1.10.3/opal/include/opal/sys/hppa/Makefile.am
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/hppa/Makefile.am
++++ openmpi-1.10.3/opal/include/opal/sys/hppa/Makefile.am
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -174,10 +174,10 @@
+headers += \
+ opal/sys/hppa/atomic.h \
+ opal/sys/hppa/timer.h
-Index: openmpi-1.10.2/opal/include/opal/sys/hppa/timer.h
+Index: openmpi-1.10.3/opal/include/opal/sys/hppa/timer.h
===================================================================
--- /dev/null
-+++ openmpi-1.10.2/opal/include/opal/sys/hppa/timer.h
++++ openmpi-1.10.3/opal/include/opal/sys/hppa/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -212,11 +212,11 @@
+#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
+
+#endif /* ! OMPI_SYS_ARCH_TIMER_H */
-Index: openmpi-1.10.2/opal/include/opal/sys/timer.h
-===================================================================
---- openmpi-1.10.2.orig/opal/include/opal/sys/timer.h
-+++ openmpi-1.10.2/opal/include/opal/sys/timer.h
-@@ -87,6 +87,8 @@ BEGIN_C_DECLS
+Index: openmpi-1.10.3/opal/include/opal/sys/timer.h
+===================================================================
+--- openmpi-1.10.3.orig/opal/include/opal/sys/timer.h
++++ openmpi-1.10.3/opal/include/opal/sys/timer.h
+@@ -90,6 +90,8 @@ BEGIN_C_DECLS
#include "opal/sys/ia32/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
#include "opal/sys/ia64/timer.h"
@@ -225,10 +225,10 @@
#elif OPAL_ASSEMBLY_ARCH == OMPI_POWERPC32
#include "opal/sys/powerpc/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_POWERPC64
-Index: openmpi-1.10.2/opal/mca/timer/linux/configure.m4
-===================================================================
---- openmpi-1.10.2.orig/opal/mca/timer/linux/configure.m4
-+++ openmpi-1.10.2/opal/mca/timer/linux/configure.m4
+Index: openmpi-1.10.3/opal/mca/timer/linux/configure.m4
+===================================================================
+--- openmpi-1.10.3.orig/opal/mca/timer/linux/configure.m4
++++ openmpi-1.10.3/opal/mca/timer/linux/configure.m4
@@ -44,7 +44,7 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[
[timer_linux_happy="no"])])
Modified: openmpi/trunk/debian/patches/manpage_macros
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/manpage_macros?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/manpage_macros (original)
+++ openmpi/trunk/debian/patches/manpage_macros Tue Jun 21 12:46:06 2016
@@ -5,10 +5,10 @@
Forwarded: yes
Last-Update: 2011-09-13
-Index: openmpi-1.10.2/orte/tools/orterun/orterun.1in
+Index: openmpi-1.10.3/orte/tools/orterun/orterun.1in
===================================================================
---- openmpi-1.10.2.orig/orte/tools/orterun/orterun.1in
-+++ openmpi-1.10.2/orte/tools/orterun/orterun.1in
+--- openmpi-1.10.3.orig/orte/tools/orterun/orterun.1in
++++ openmpi-1.10.3/orte/tools/orterun/orterun.1in
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
.\" Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
Modified: openmpi/trunk/debian/patches/mips-detection.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/mips-detection.diff?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/mips-detection.diff (original)
+++ openmpi/trunk/debian/patches/mips-detection.diff Tue Jun 21 12:46:06 2016
@@ -1,11 +1,11 @@
Description: Support detection of mips, mipsel, mips64, mips64el architectures
Author: Jurica Stanojkovic <Jurica.Stanojkovic at imgtec.com>
-Index: openmpi-1.10.2/configure
+Index: openmpi-1.10.3/configure
===================================================================
---- openmpi-1.10.2.orig/configure
-+++ openmpi-1.10.2/configure
-@@ -31394,8 +31394,13 @@ _ACEOF
+--- openmpi-1.10.3.orig/configure
++++ openmpi-1.10.3/configure
+@@ -31408,8 +31408,13 @@ _ACEOF
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -21,10 +21,10 @@
# a MIPS III machine (r4000 and later)
ompi_cv_asm_arch="MIPS"
OPAL_ASM_SUPPORT_64BIT=1
-Index: openmpi-1.10.2/config/opal_config_asm.m4
+Index: openmpi-1.10.3/config/opal_config_asm.m4
===================================================================
---- openmpi-1.10.2.orig/config/opal_config_asm.m4
-+++ openmpi-1.10.2/config/opal_config_asm.m4
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
@@ -847,8 +847,13 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
Modified: openmpi/trunk/debian/patches/mpi_win.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/mpi_win.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/mpi_win.patch (original)
+++ openmpi/trunk/debian/patches/mpi_win.patch Tue Jun 21 12:46:06 2016
@@ -1,28 +1,2 @@
-Index: openmpi/ompi/win/win.c
-===================================================================
---- openmpi.orig/ompi/win/win.c
-+++ openmpi/ompi/win/win.c
-@@ -139,18 +139,18 @@ config_window(void *base, size_t size, i
- MPI_WIN_SIZE, size, true);
- if (OMPI_SUCCESS != ret) return ret;
-
-- ret = ompi_attr_set_fortran_mpi2(WIN_ATTR, win,
-+ ret = ompi_attr_set_fortran_mpi1(WIN_ATTR, win,
- &win->w_keyhash,
- MPI_WIN_DISP_UNIT, disp_unit,
- true);
- if (OMPI_SUCCESS != ret) return ret;
-
-- ret = ompi_attr_set_fortran_mpi2(WIN_ATTR, win,
-+ ret = ompi_attr_set_fortran_mpi1(WIN_ATTR, win,
- &win->w_keyhash,
- MPI_WIN_CREATE_FLAVOR, flavor, true);
- if (OMPI_SUCCESS != ret) return ret;
-
-- ret = ompi_attr_set_fortran_mpi2(WIN_ATTR, win,
-+ ret = ompi_attr_set_fortran_mpi1(WIN_ATTR, win,
- &win->w_keyhash,
- MPI_WIN_MODEL, model, true);
- if (OMPI_SUCCESS != ret) return ret;
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=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/opal_thread_add64.patch (original)
+++ openmpi/trunk/debian/patches/opal_thread_add64.patch Tue Jun 21 12:46:06 2016
@@ -5,32 +5,3 @@
Forwarded: yes
Bug-Debian: https://bugs.debian.org/816303
-diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c b/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
-index 523d7da..d040d51 100644
---- a/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
-+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
-@@ -8,7 +8,7 @@
- * University of Stuttgart. All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- * All rights reserved.
-- * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights
-+ * Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights
- * reserved.
- * Copyright (c) 2010 IBM Corporation. All rights reserved.
- * Copyright (c) 2012-2013 Sandia National Laboratories. All rights reserved.
-@@ -331,13 +331,14 @@ static int ompi_osc_pt2pt_lock_internal (int lock_type, int target, int assert,
- lock->target = target;
- lock->lock_acks_expected = 0;
- lock->unlock_acks_expected = 0;
-- lock->serial_number = OPAL_THREAD_ADD64((int64_t *) &module->lock_serial_number, 1);
- lock->type = lock_type;
- lock->assert = assert;
-
- /* delay all eager sends until we've heard back.. */
- OPAL_THREAD_LOCK(&module->lock);
-
-+ lock->serial_number = module->lock_serial_number + 1;
-+
- /* check for conflicting lock */
- if (find_outstanding_lock_st (module, target)) {
- OBJ_RELEASE(lock);
Modified: openmpi/trunk/debian/patches/reproducible-build.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/reproducible-build.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/reproducible-build.patch (original)
+++ openmpi/trunk/debian/patches/reproducible-build.patch Tue Jun 21 12:46:06 2016
@@ -4,10 +4,10 @@
Forwarded: no
Last-Updated: 2016-05-23
-Index: openmpi/ompi/debuggers/ompi_msgq_dll.c
+Index: openmpi-1.10.3/ompi/debuggers/ompi_msgq_dll.c
===================================================================
---- openmpi.orig/ompi/debuggers/ompi_msgq_dll.c
-+++ openmpi/ompi/debuggers/ompi_msgq_dll.c
+--- openmpi-1.10.3.orig/ompi/debuggers/ompi_msgq_dll.c
++++ openmpi-1.10.3/ompi/debuggers/ompi_msgq_dll.c
@@ -190,7 +190,7 @@ int mqs_version_compatibility (void)
char *mqs_version_string (void)
{
@@ -17,10 +17,10 @@
} /* mqs_version_string */
/* So the debugger can tell what interface width the library was compiled with */
-Index: openmpi/ompi/CMakeLists.txt
+Index: openmpi-1.10.3/ompi/CMakeLists.txt
===================================================================
---- openmpi.orig/ompi/CMakeLists.txt
-+++ openmpi/ompi/CMakeLists.txt
+--- openmpi-1.10.3.orig/ompi/CMakeLists.txt
++++ openmpi-1.10.3/ompi/CMakeLists.txt
@@ -32,6 +32,7 @@ FOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
FILE(GLOB_RECURSE OMPI_${OMPI_SUBDIR}_FILES
@@ -45,10 +45,10 @@
SET_SOURCE_FILES_PROPERTIES(${OMPI_FORTRAN_BASE_FILES}
PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}OMPI_COMPILING_FORTRAN_WRAPPERS=1 ${OMPI_C_DEF_PRE}OMPI_PROFILE_LAYER=0")
SET(OMPI_SOURCE_FILES ${OMPI_SOURCE_FILES} ${OMPI_FORTRAN_BASE_FILES})
-Index: openmpi/ompi/mpi/cxx/CMakeLists.txt
+Index: openmpi-1.10.3/ompi/mpi/cxx/CMakeLists.txt
===================================================================
---- openmpi.orig/ompi/mpi/cxx/CMakeLists.txt
-+++ openmpi/ompi/mpi/cxx/CMakeLists.txt
+--- openmpi-1.10.3.orig/ompi/mpi/cxx/CMakeLists.txt
++++ openmpi-1.10.3/ompi/mpi/cxx/CMakeLists.txt
@@ -8,6 +8,7 @@
#
@@ -57,10 +57,10 @@
# skip the file interface sources if not wanted
IF(NOT OMPI_PROVIDE_MPI_FILE_INTERFACE)
-Index: openmpi/ompi/tools/ompi_info/CMakeLists.txt
+Index: openmpi-1.10.3/ompi/tools/ompi_info/CMakeLists.txt
===================================================================
---- openmpi.orig/ompi/tools/ompi_info/CMakeLists.txt
-+++ openmpi/ompi/tools/ompi_info/CMakeLists.txt
+--- openmpi-1.10.3.orig/ompi/tools/ompi_info/CMakeLists.txt
++++ openmpi-1.10.3/ompi/tools/ompi_info/CMakeLists.txt
@@ -8,6 +8,7 @@
#
@@ -69,10 +69,10 @@
ADD_EXECUTABLE (ompi_info ${OMPI_INFO_SOURCE_FILES})
ADD_DEPENDENCIES(ompi_info libmpi)
-Index: openmpi/opal/CMakeLists.txt
+Index: openmpi-1.10.3/opal/CMakeLists.txt
===================================================================
---- openmpi.orig/opal/CMakeLists.txt
-+++ openmpi/opal/CMakeLists.txt
+--- openmpi-1.10.3.orig/opal/CMakeLists.txt
++++ openmpi-1.10.3/opal/CMakeLists.txt
@@ -35,6 +35,7 @@ ENDIF(OPAL_WANT_LIBLTDL)
# Include headers.
@@ -93,10 +93,10 @@
SET (OPAL_SOURCE_FILES
${OPAL_SOURCE_FILES}
${OPAL_${OPAL_SUBDIR}_FILES}
-Index: openmpi/opal/tools/opal-checkpoint/CMakeLists.txt
+Index: openmpi-1.10.3/opal/tools/opal-checkpoint/CMakeLists.txt
===================================================================
---- openmpi.orig/opal/tools/opal-checkpoint/CMakeLists.txt
-+++ openmpi/opal/tools/opal-checkpoint/CMakeLists.txt
+--- openmpi-1.10.3.orig/opal/tools/opal-checkpoint/CMakeLists.txt
++++ openmpi-1.10.3/opal/tools/opal-checkpoint/CMakeLists.txt
@@ -8,6 +8,7 @@
#
@@ -105,10 +105,10 @@
ADD_EXECUTABLE (opal-checkpoint ${OPAL_CHECKPOINT_SOURCE_FILES})
-Index: openmpi/opal/tools/opal-restart/CMakeLists.txt
+Index: openmpi-1.10.3/opal/tools/opal-restart/CMakeLists.txt
===================================================================
---- openmpi.orig/opal/tools/opal-restart/CMakeLists.txt
-+++ openmpi/opal/tools/opal-restart/CMakeLists.txt
+--- openmpi-1.10.3.orig/opal/tools/opal-restart/CMakeLists.txt
++++ openmpi-1.10.3/opal/tools/opal-restart/CMakeLists.txt
@@ -8,6 +8,7 @@
#
@@ -117,10 +117,10 @@
ADD_EXECUTABLE (opal-restart ${OPAL_RESTART_SOURCE_FILES})
-Index: openmpi/opal/tools/wrappers/CMakeLists.txt
+Index: openmpi-1.10.3/opal/tools/wrappers/CMakeLists.txt
===================================================================
---- openmpi.orig/opal/tools/wrappers/CMakeLists.txt
-+++ openmpi/opal/tools/wrappers/CMakeLists.txt
+--- openmpi-1.10.3.orig/opal/tools/wrappers/CMakeLists.txt
++++ openmpi-1.10.3/opal/tools/wrappers/CMakeLists.txt
@@ -8,6 +8,7 @@
#
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Tue Jun 21 12:46:06 2016
@@ -8,5 +8,3 @@
reproducible-build.patch
fix-man-pages.patch
x32.patch
-opal_thread_add64.patch
-mpi_win.patch
Modified: openmpi/trunk/debian/patches/x32.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/x32.patch?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/x32.patch (original)
+++ openmpi/trunk/debian/patches/x32.patch Tue Jun 21 12:46:06 2016
@@ -4,8 +4,10 @@
Forwarded: no
Last-Updated: 2016-02-10
---- openmpi-1.10.2.orig/config/opal_config_asm.m4
-+++ openmpi-1.10.2/config/opal_config_asm.m4
+Index: openmpi-1.10.3/config/opal_config_asm.m4
+===================================================================
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
@@ -795,6 +795,11 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN=""
OPAL_ASM_SUPPORT_64BIT=0
@@ -18,4 +20,3 @@
i?86-*|x86_64*)
if test "$ac_cv_sizeof_long" = "4" ; then
ompi_cv_asm_arch="IA32"
-
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=388&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Tue Jun 21 12:46:06 2016
@@ -39,6 +39,11 @@
%:
dh $@ --parallel #--with autotools_dev
+
+override_dh_auto_clean:
+ dh_clean
+ find . -name .dir-stamp -delete
+ find . -type l -delete
override_dh_auto_configure:
./autogen.sh
@@ -106,10 +111,10 @@
cp -a debian/tmp/usr/share/man/man1/oshrun.1 debian/openmpi-bin/usr/share/man/man1 ; \
cp -a debian/tmp/usr/share/man/man1/oshmem_info.1 debian/openmpi-bin/usr/share/man/man1 ; \
fi
- if test -f debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; then \
+ if test -f debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.1 ; then \
mkdir -p debian/libopenmpi1.10/usr/lib/openmpi/lib ; \
- cp -a debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 \
- debian/libopenmpi1.10/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; \
+ cp -a debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.1 \
+ debian/libopenmpi1.10/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.1 ; \
fi
if test -f debian/tmp/usr/bin/shmemrun ; then \
cp -a debian/tmp/usr/bin/shmemrun debian/openmpi-bin/usr/bin/shmemrun ;\
More information about the Pkg-openmpi-commits
mailing list