[Pkg-openmpi-commits] r363 - in /openmpi/branches/experimental/debian: changelog control patches/build_hurd patches/fix-man-pages.patch

mckinstry at users.alioth.debian.org mckinstry at users.alioth.debian.org
Tue Feb 9 19:44:07 UTC 2016 

Author: mckinstry
Date: Tue Feb  9 19:44:07 2016
New Revision: 363

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=363
Log:
* Define PATH_MAX in ompi_config.h and other fixes for Hurd.
* Build-Conflict on libmpich-dev.

Added:
    openmpi/branches/experimental/debian/patches/fix-man-pages.patch
Modified:
    openmpi/branches/experimental/debian/changelog
    openmpi/branches/experimental/debian/control
    openmpi/branches/experimental/debian/patches/build_hurd

Modified: openmpi/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/changelog?rev=363&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog	(original)
+++ openmpi/branches/experimental/debian/changelog	Tue Feb  9 19:44:07 2016
@@ -2,10 +2,11 @@
 
   * libopenmpi-dev recommends openmpi-doc. Closes: #813929.
   * Fix formatting errors in man pages.  Silences lintian :-)
-  * Define PATH_MAX in ompi_config.h for Hurd.
+  * Define PATH_MAX in ompi_config.h and other fixes for Hurd.
   * Change packages to Arch: any so s390x can build. Closes: #813734.
   * Test suite enabled, so Closes: #719896.
   * Close old bugs as we now support hppa, s390: Closes: #376833, #389306.
+  * Build-Conflict on libmpich-dev.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 06 Feb 2016 02:09:58 +0000
 

Modified: openmpi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/control?rev=363&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/control	(original)
+++ openmpi/branches/experimental/debian/control	Tue Feb  9 19:44:07 2016
@@ -10,7 +10,7 @@
  libcr-dev [amd64 armel armhf i386 powerpc], libtool, libltdl-dev,
  libnuma-dev [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64el], autoconf (>= 2.59),
  automake
-Build-Conflicts: libopenmpi1.6, libopenmpi1.10
+Build-Conflicts: libopenmpi1.6, libopenmpi1.10, libmpich-dev
 Standards-Version: 3.9.7
 Homepage: http://www.open-mpi.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/

Modified: openmpi/branches/experimental/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/build_hurd?rev=363&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/build_hurd	(original)
+++ openmpi/branches/experimental/debian/patches/build_hurd	Tue Feb  9 19:44:07 2016
@@ -239,14 +239,49 @@
 ===================================================================
 --- openmpi-1.10.2.orig/opal/mca/base/mca_base_var.c
 +++ openmpi-1.10.2/opal/mca/base/mca_base_var.c
-@@ -50,6 +50,10 @@
+@@ -50,6 +50,14 @@
  #include "opal/util/opal_environ.h"
  #include "opal/runtime/opal.h"
  
++#ifndef MAXPATHLEN /* Hurd */
++#define MAXPATHLEN 65535
++#endif
++
 +#ifndef PATH_MAX  /* Hurd */
-+#define PATH_MAX 2048
++#define PATH_MAX 65535
 +#endif
 +
  /*
   * 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
+@@ -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
+@@ -31,8 +31,10 @@
+ #include <dirent.h>
+
+ #include <sys/param.h>
++#ifdef HAVE_SYS_MOUNT_H
+ #include <sys/mount.h>
+-#ifdef HAVE_SYS_STATFS_H
++#endif
++#if defined(__linux__) /* not present on Hurd */
+ #include <sys/statfs.h>
+ #endif
+ #ifdef HAVE_SYS_VFS_H

Added: openmpi/branches/experimental/debian/patches/fix-man-pages.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/fix-man-pages.patch?rev=363&op=file
==============================================================================
--- openmpi/branches/experimental/debian/patches/fix-man-pages.patch	(added)
+++ openmpi/branches/experimental/debian/patches/fix-man-pages.patch	Tue Feb  9 19:44:07 2016
@@ -0,0 +1,54 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix typos, etc. caught by Lintian.
+Last-Updated: 2016-02-07
+Forwarded: no
+
+Index: openmpi-1.10.2/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
+@@ -79,7 +79,7 @@ window object used for communication (ha
+ 
+ .SH OUTPUT PARAMETER
+ .ft R
+-.TP li
++.TP 1i
+ request
+ MPI_Rget: RMA request
+ .TP 1i
+Index: openmpi-1.10.2/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
+@@ -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.
+ .sp
+-\fBMPI_Rput\bP is similar to \fBMPI_Put\fI, except that it allocates a communication request object and associates it with the request handle (the argument \fIrequest\fP). The completion of an MPI_Rput operation (i.e., after the corresponding test or wait) indicates that the sender is now free to update the locations in the \fIorigin_addr\fP buffer. It does not indicate that the data is available at the target window. If remote completion is required, \fBMPI_Win_flush\fP, \fBMPI_Win_flush_all\fP, \fBMPI_Win_unlock\fP, or \fBMPI_Win_unlock_all\fP can be used.
++\fBMPI_Rput\fP is similar to \fBMPI_Put\fI, except that it allocates a communication request object and associates it with the request handle (the argument \fIrequest\fP). The completion of an MPI_Rput operation (i.e., after the corresponding test or wait) indicates that the sender is now free to update the locations in the \fIorigin_addr\fP buffer. It does not indicate that the data is available at the target window. If remote completion is required, \fBMPI_Win_flush\fP, \fBMPI_Win_flush_all\fP, \fBMPI_Win_unlock\fP, or \fBMPI_Win_unlock_all\fP can be used.
+ 
+ .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
+===================================================================
+--- openmpi-1.10.2.orig/orte/tools/orte-dvm/orte-dvm.1in
++++ openmpi-1.10.2/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
+===================================================================
+--- openmpi-1.10.2.orig/orte/tools/orte-submit/orte-submit.1in
++++ openmpi-1.10.2/orte/tools/orte-submit/orte-submit.1in
+@@ -1,7 +1,7 @@
+ .\" -*- 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.
++.\" Copyright (c) 2015      Intel, Inc. All rights reserved.
+ .\" $COPYRIGHT$
+ .\"
+ .\" Man page for ORTE's orte-submit command

More information about the Pkg-openmpi-commits mailing list