[Pkg-openmpi-commits] r302 - in /openmpi/branches/1.4/debian: changelog control patches/arm_support patches/build_hurd patches/manpage_macros patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue May 15 16:02:34 UTC 2012
Author: sylvestre
Date: Tue May 15 16:02:34 2012
New Revision: 302
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=302
Log:
* ACK NMUs
* Non-maintainer upload
* debian/patches/arm_support: fix ARM timer code, by Leif Lindholm.
Closes: #666110.
* debian/libopenmpi1.3.lintian-overrides: New file, override
"embedded-library" lintian error, see #671621.
* debian/rules: Add dh_lintian.
* Non-maintainer upload
* Add openmpi link fix, closes: #621978
- Thanks to Daniel Schepler <dschepler at gmail.com>
* Add arm support from ubuntu, closes: #617779
- Thanks to Jani Monoses <jani at ubuntu.com>
Added:
openmpi/branches/1.4/debian/patches/arm_support
Modified:
openmpi/branches/1.4/debian/changelog
openmpi/branches/1.4/debian/control
openmpi/branches/1.4/debian/patches/build_hurd
openmpi/branches/1.4/debian/patches/manpage_macros
openmpi/branches/1.4/debian/patches/series
openmpi/branches/1.4/debian/rules
Modified: openmpi/branches/1.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/changelog?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/changelog (original)
+++ openmpi/branches/1.4/debian/changelog Tue May 15 16:02:34 2012
@@ -1,11 +1,33 @@
openmpi (1.4.5-1) unstable; urgency=low
* New upstream release
+ * ACK NMUs
* Switch to dpkg-source 3.0 (quilt) format
* Refresh of the patches
* Standards-Version updated to version 3.9.3
-- Sylvestre Ledru <sylvestre at debian.org> Wed, 22 Feb 2012 17:17:31 +0100
+
+openmpi (1.4.3-2.2) unstable; urgency=low
+
+ * Non-maintainer upload
+ * debian/patches/arm_support: fix ARM timer code, by Leif Lindholm.
+ Closes: #666110.
+ * debian/libopenmpi1.3.lintian-overrides: New file, override
+ "embedded-library" lintian error, see #671621.
+ * debian/rules: Add dh_lintian.
+
+ -- Michael Banck <mbanck at debian.org> Sat, 05 May 2012 17:02:38 +0200
+
+openmpi (1.4.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Add openmpi link fix, closes: #621978
+ - Thanks to Daniel Schepler <dschepler at gmail.com>
+ * Add arm support from ubuntu, closes: #617779
+ - Thanks to Jani Monoses <jani at ubuntu.com>
+
+ -- Riku Voipio <riku.voipio at iki.fi> Wed, 20 Apr 2011 19:53:03 +0300
openmpi (1.4.3-2) unstable; urgency=low
Modified: openmpi/branches/1.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/control?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/control (original)
+++ openmpi/branches/1.4/debian/control Tue May 15 16:02:34 2012
@@ -10,7 +10,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
Package: openmpi-bin
-Architecture: alpha amd64 i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
Recommends: openmpi-checkpoint [ amd64 armel i386 powerpc ]
Suggests: gfortran
@@ -39,7 +39,7 @@
Package: libopenmpi-dev
Section: libdevel
-Architecture: alpha amd64 i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.3 (= ${binary:Version}), openmpi-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Conflicts: openmpi-dev
Replaces: openmpi-dev, openmpi-bin (<= 1.2.4-0)
@@ -56,7 +56,7 @@
Package: libopenmpi1.3
Section: libs
-Architecture: alpha amd64 i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: openmpi-libs0, libopenmpi1
Replaces: openmpi-libs0, libopenmpi1
@@ -101,7 +101,7 @@
Package: libopenmpi-dbg
Section: debug
-Architecture: alpha amd64 i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${misc:Depends}, openmpi-bin (= ${binary:Version}), libopenmpi1.3 (= ${binary:Version})
Conflicts: openmpi-dbg
Replaces: openmpi-dbg
Added: openmpi/branches/1.4/debian/patches/arm_support
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/arm_support?rev=302&op=file
==============================================================================
--- openmpi/branches/1.4/debian/patches/arm_support (added)
+++ openmpi/branches/1.4/debian/patches/arm_support Tue May 15 16:02:34 2012
@@ -1,0 +1,324 @@
+## Description: Support building for arm
+## Origin/Author: jani.monoses at canonical.com
+## Bug: bug URL
+Index: openmpi-1.4.3/config/ompi_config_asm.m4
+===================================================================
+--- openmpi-1.4.3.orig/config/ompi_config_asm.m4 2011-01-06 14:07:27.000000000 +0200
++++ openmpi-1.4.3/config/ompi_config_asm.m4 2011-01-06 14:49:30.000000000 +0200
+@@ -875,6 +875,12 @@
+ OMPI_GCC_INLINE_ASSIGN='"movl [$]0, %0" : "=&r"(ret)'
+ ;;
+
++ arm*)
++ ompi_cv_asm_arch="ARM"
++ OMPI_ASM_SUPPORT_64BIT=1
++ OMPI_GCC_INLINE_ASSIGN='"mov r0, 0" : "=&r"(ret)'
++ ;;
++
+ ia64-*)
+ ompi_cv_asm_arch="IA64"
+ OMPI_ASM_SUPPORT_64BIT=1
+Index: openmpi-1.4.3/opal/include/opal/sys/Makefile.am
+===================================================================
+--- openmpi-1.4.3.orig/opal/include/opal/sys/Makefile.am 2011-01-06 14:07:27.000000000 +0200
++++ openmpi-1.4.3/opal/include/opal/sys/Makefile.am 2011-01-06 14:49:30.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ include opal/sys/alpha/Makefile.am
+ include opal/sys/amd64/Makefile.am
++include opal/sys/arm/Makefile.am
+ include opal/sys/ia32/Makefile.am
+ include opal/sys/ia64/Makefile.am
+ include opal/sys/mips/Makefile.am
+Index: openmpi-1.4.3/opal/include/opal/sys/architecture.h
+===================================================================
+--- openmpi-1.4.3.orig/opal/include/opal/sys/architecture.h 2011-01-06 14:07:27.000000000 +0200
++++ openmpi-1.4.3/opal/include/opal/sys/architecture.h 2011-01-06 14:49:30.000000000 +0200
+@@ -36,6 +36,7 @@
+ #define OMPI_SPARCV9_32 0061
+ #define OMPI_SPARCV9_64 0062
+ #define OMPI_MIPS 0070
++#define OMPI_ARM 0100
+
+ /* Formats */
+ #define OMPI_DEFAULT 1000 /* standard for given architecture */
+Index: openmpi-1.4.3/opal/include/opal/sys/arm/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ openmpi-1.4.3/opal/include/opal/sys/arm/Makefile.am 2011-01-06 14:49:30.000000000 +0200
+@@ -0,0 +1,23 @@
++#
++# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
++# University Research and Technology
++# Corporation. All rights reserved.
++# Copyright (c) 2004-2005 The University of Tennessee and The University
++# of Tennessee Research Foundation. All rights
++# reserved.
++# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
++# University of Stuttgart. All rights reserved.
++# Copyright (c) 2004-2005 The Regents of the University of California.
++# All rights reserved.
++# $COPYRIGHT$
++#
++# Additional copyrights may follow
++#
++# $HEADER$
++#
++
++# This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
++
++headers += \
++ opal/sys/arm/atomic.h \
++ opal/sys/arm/timer.h
+Index: openmpi-1.4.3/opal/include/opal/sys/arm/atomic.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ openmpi-1.4.3/opal/include/opal/sys/arm/atomic.h 2011-01-06 14:49:30.000000000 +0200
+@@ -0,0 +1,163 @@
++/*
++ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
++ * University Research and Technology
++ * Corporation. All rights reserved.
++ * Copyright (c) 2004-2005 The University of Tennessee and The University
++ * of Tennessee Research Foundation. All rights
++ * reserved.
++ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
++ * University of Stuttgart. All rights reserved.
++ * Copyright (c) 2004-2005 The Regents of the University of California.
++ * All rights reserved.
++ * $COPYRIGHT$
++ *
++ * Additional copyrights may follow
++ *
++ * $HEADER$
++ */
++
++#ifndef OMPI_SYS_ARCH_ATOMIC_H
++#define OMPI_SYS_ARCH_ATOMIC_H 1
++
++/*
++ * On armv7, everything is load-locked, store-conditional...
++ */
++
++#if OMPI_WANT_SMP_LOCKS
++#define MB() __sync_synchronize();
++#define RMB() MB()
++#define WMB() MB();
++
++#else
++
++#define MB()
++#define RMB()
++#define WMB()
++
++#endif
++
++
++/**********************************************************************
++ *
++ * Define constants for ARM
++ *
++ *********************************************************************/
++#define OPAL_HAVE_ATOMIC_MEM_BARRIER 1
++
++#define OPAL_HAVE_ATOMIC_CMPSET_32 1
++#define OPAL_HAVE_ATOMIC_MATH_32 1
++#define OPAL_HAVE_ATOMIC_ADD_32 1
++#define OPAL_HAVE_ATOMIC_SUB_32 1
++
++#define OPAL_HAVE_ATOMIC_CMPSET_64 0
++#define OPAL_HAVE_ATOMIC_MATH_64 0
++#define OPAL_HAVE_ATOMIC_ADD_64 0
++#define OPAL_HAVE_ATOMIC_SUB_64 0
++
++/**********************************************************************
++ *
++ * Memory Barriers
++ *
++ *********************************************************************/
++
++static inline void opal_atomic_mb(void)
++{
++ MB();
++}
++
++
++static inline void opal_atomic_rmb(void)
++{
++ RMB();
++}
++
++
++static inline void opal_atomic_wmb(void)
++{
++ WMB();
++}
++
++
++/**********************************************************************
++ *
++ * Atomic math operations
++ *
++ *********************************************************************/
++
++static inline int opal_atomic_cmpset_32( volatile int32_t *addr,
++ int32_t oldval, int32_t newval)
++{
++ return __sync_bool_compare_and_swap(addr, oldval, newval);
++}
++
++static inline int opal_atomic_cmpset_acq_32(volatile int32_t *addr,
++ int32_t oldval,
++ int32_t newval)
++{
++ int rc;
++
++ rc = opal_atomic_cmpset_32(addr, oldval, newval);
++ opal_atomic_rmb();
++
++ return rc;
++}
++
++
++static inline int opal_atomic_cmpset_rel_32(volatile int32_t *addr,
++ int32_t oldval,
++ int32_t newval)
++{
++ opal_atomic_wmb();
++ return opal_atomic_cmpset_32(addr, oldval, newval);
++}
++
++
++static inline int opal_atomic_cmpset_64( volatile int64_t *addr,
++ int64_t oldval, int64_t newval)
++{
++ return __sync_bool_compare_and_swap(addr, oldval, newval);
++}
++
++
++static inline int opal_atomic_cmpset_acq_64(volatile int64_t *addr,
++ int64_t oldval,
++ int64_t newval)
++{
++ int rc;
++
++ rc = opal_atomic_cmpset_64(addr, oldval, newval);
++ opal_atomic_rmb();
++
++ return rc;
++}
++
++
++static inline int opal_atomic_cmpset_rel_64(volatile int64_t *addr,
++ int64_t oldval,
++ int64_t newval)
++{
++ opal_atomic_wmb();
++ return opal_atomic_cmpset_64(addr, oldval, newval);
++}
++
++static inline int32_t opal_atomic_add_32(volatile int32_t* v, int inc)
++{
++ return __sync_add_and_fetch(v, inc);
++}
++
++static inline int64_t opal_atomic_sub_64(volatile int64_t* v, int64_t dec)
++{
++ return __sync_sub_and_fetch(v, dec);
++}
++
++static inline int64_t opal_atomic_add_64(volatile int64_t* v, int64_t inc)
++{
++ return __sync_add_and_fetch(v, inc);
++}
++
++
++static inline int32_t opal_atomic_sub_32(volatile int32_t* v, int dec)
++{
++ return __sync_sub_and_fetch(v, dec);
++}
++#endif /* ! OMPI_SYS_ARCH_ATOMIC_H */
+Index: openmpi-1.4.3/opal/include/opal/sys/atomic.h
+===================================================================
+--- openmpi-1.4.3.orig/opal/include/opal/sys/atomic.h 2011-01-06 14:07:27.000000000 +0200
++++ openmpi-1.4.3/opal/include/opal/sys/atomic.h 2011-01-06 14:49:30.000000000 +0200
+@@ -148,6 +148,8 @@
+ #include "opal/sys/alpha/atomic.h"
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_AMD64
+ #include "opal/sys/amd64/atomic.h"
++#elif OMPI_ASSEMBLY_ARCH == OMPI_ARM
++#include "opal/sys/arm/atomic.h"
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_IA32
+ #include "opal/sys/ia32/atomic.h"
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_IA64
+Index: openmpi-1.4.3/opal/include/opal/sys/arm/timer.h
+===================================================================
+--- /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,40 @@
++/*
++ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
++ * University Research and Technology
++ * Corporation. All rights reserved.
++ * Copyright (c) 2004-2005 The University of Tennessee and The University
++ * of Tennessee Research Foundation. All rights
++ * reserved.
++ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
++ * University of Stuttgart. All rights reserved.
++ * Copyright (c) 2004-2005 The Regents of the University of California.
++ * All rights reserved.
++ * $COPYRIGHT$
++ *
++ * Additional copyrights may follow
++ *
++ * $HEADER$
++ */
++
++#ifndef OMPI_SYS_ARCH_TIMER_H
++#define OMPI_SYS_ARCH_TIMER_H 1
++
++#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)
++{
++ 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 */
+Index: openmpi-1.4.3/opal/include/opal/sys/timer.h
+===================================================================
+--- openmpi-1.4.3.orig/opal/include/opal/sys/timer.h 2011-01-06 14:07:27.000000000 +0200
++++ openmpi-1.4.3/opal/include/opal/sys/timer.h 2011-01-06 14:49:30.000000000 +0200
+@@ -81,6 +81,8 @@
+ /* don't include system-level gorp when generating doxygen files */
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_AMD64
+ #include "opal/sys/amd64/timer.h"
++#elif OMPI_ASSEMBLY_ARCH == OMPI_ARM
++#include "opal/sys/arm/timer.h"
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_IA32
+ #include "opal/sys/ia32/timer.h"
+ #elif OMPI_ASSEMBLY_ARCH == OMPI_IA64
+Index: openmpi-1.4.3/opal/mca/timer/linux/configure.m4
+===================================================================
+--- openmpi-1.4.3.orig/opal/mca/timer/linux/configure.m4 2011-01-06 14:07:26.000000000 +0200
++++ openmpi-1.4.3/opal/mca/timer/linux/configure.m4 2011-01-06 14:49:30.000000000 +0200
+@@ -42,7 +42,7 @@
+ [timer_linux_happy="no"])])
+
+ case "${host}" in
+- i?86-*linux*|x86_64*linux*|ia64-*linux*|powerpc-*linux*|powerpc64-*linux*|sparc*-*linux*)
++ i?86-*linux*|x86_64*linux*|ia64-*linux*|powerpc-*linux*|powerpc64-*linux*|sparc*-*linux*|arm*-*linux*)
+ AS_IF([test "$timer_linux_happy" = "yes"],
+ [AS_IF([test -r "/proc/cpuinfo"],
+ [timer_linux_happy="yes"],
Modified: openmpi/branches/1.4/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/build_hurd?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/build_hurd (original)
+++ openmpi/branches/1.4/debian/patches/build_hurd Tue May 15 16:02:34 2012
@@ -4,10 +4,8 @@
Forwarded: yes
Last-Update: 2010-07-20
-Index: openmpi-1.4.5/ompi/runtime/ompi_mpi_abort.c
-===================================================================
---- openmpi-1.4.5.orig/ompi/runtime/ompi_mpi_abort.c 2009-12-08 21:36:11.000000000 +0100
-+++ openmpi-1.4.5/ompi/runtime/ompi_mpi_abort.c 2012-02-22 17:14:09.000000000 +0100
+--- a/ompi/runtime/ompi_mpi_abort.c
++++ b/ompi/runtime/ompi_mpi_abort.c
@@ -53,10 +53,11 @@
bool kill_remote_of_intercomm)
{
@@ -54,10 +52,8 @@
/* abort local procs in the communicator. If the communicator is
an intercommunicator AND the abort has explicitly requested
that we abort the remote procs, then do that as well. */
-Index: openmpi-1.4.5/ompi/runtime/ompi_mpi_finalize.c
-===================================================================
---- openmpi-1.4.5.orig/ompi/runtime/ompi_mpi_finalize.c 2009-12-08 21:36:11.000000000 +0100
-+++ openmpi-1.4.5/ompi/runtime/ompi_mpi_finalize.c 2012-02-22 17:14:09.000000000 +0100
+--- a/ompi/runtime/ompi_mpi_finalize.c
++++ b/ompi/runtime/ompi_mpi_finalize.c
@@ -100,13 +100,18 @@
/* Note that if we're already finalized, we cannot raise an
MPI exception. The best that we can do is write something
@@ -79,10 +75,8 @@
return MPI_ERR_OTHER;
}
-Index: openmpi-1.4.5/opal/mca/base/mca_base_component_find.c
-===================================================================
---- openmpi-1.4.5.orig/opal/mca/base/mca_base_component_find.c 2010-08-24 23:00:31.000000000 +0200
-+++ openmpi-1.4.5/opal/mca/base/mca_base_component_find.c 2012-02-22 17:14:09.000000000 +0100
+--- a/opal/mca/base/mca_base_component_find.c
++++ b/opal/mca/base/mca_base_component_find.c
@@ -205,11 +205,16 @@
}
@@ -102,10 +96,8 @@
return OPAL_ERR_NOT_FOUND;
}
}
-Index: openmpi-1.4.5/opal/mca/base/mca_base_param.c
-===================================================================
---- openmpi-1.4.5.orig/opal/mca/base/mca_base_param.c 2009-12-08 21:36:07.000000000 +0100
-+++ openmpi-1.4.5/opal/mca/base/mca_base_param.c 2012-02-22 17:14:09.000000000 +0100
+--- a/opal/mca/base/mca_base_param.c
++++ b/opal/mca/base/mca_base_param.c
@@ -186,8 +186,14 @@
home = (char*)opal_home_directory();
@@ -122,10 +114,8 @@
opal_output(0, "Error: Unable to get the current working directory\n");
cwd = strdup(".");
}
-Index: openmpi-1.4.5/opal/mca/paffinity/darwin/configure.m4
-===================================================================
---- openmpi-1.4.5.orig/opal/mca/paffinity/darwin/configure.m4 2009-12-08 21:36:06.000000000 +0100
-+++ openmpi-1.4.5/opal/mca/paffinity/darwin/configure.m4 2012-02-22 17:14:09.000000000 +0100
+--- a/opal/mca/paffinity/darwin/configure.m4
++++ b/opal/mca/paffinity/darwin/configure.m4
@@ -23,9 +23,9 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_paffinity_darwin_CONFIG],[
@@ -138,10 +128,8 @@
AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
OMPI_VAR_SCOPE_POP
-Index: openmpi-1.4.5/opal/util/stacktrace.c
-===================================================================
---- openmpi-1.4.5.orig/opal/util/stacktrace.c 2010-04-13 19:30:27.000000000 +0200
-+++ openmpi-1.4.5/opal/util/stacktrace.c 2012-02-22 17:14:09.000000000 +0100
+--- a/opal/util/stacktrace.c
++++ b/opal/util/stacktrace.c
@@ -363,6 +363,13 @@
fflush(stderr);
}
@@ -169,10 +157,8 @@
#ifdef SA_ONESHOT
act.sa_flags |= SA_ONESHOT;
#else
-Index: openmpi-1.4.5/orte/mca/odls/base/odls_base_default_fns.c
-===================================================================
---- openmpi-1.4.5.orig/orte/mca/odls/base/odls_base_default_fns.c 2011-09-06 16:25:54.000000000 +0200
-+++ openmpi-1.4.5/orte/mca/odls/base/odls_base_default_fns.c 2012-02-22 17:14:09.000000000 +0100
+--- a/orte/mca/odls/base/odls_base_default_fns.c
++++ b/orte/mca/odls/base/odls_base_default_fns.c
@@ -851,8 +851,13 @@
orte_odls_job_t *jobdat;
orte_pmap_t *pmap;
@@ -222,10 +208,8 @@
return rc;
}
-Index: openmpi-1.4.5/orte/orted/orted_main.c
-===================================================================
---- openmpi-1.4.5.orig/orte/orted/orted_main.c 2010-04-13 19:30:34.000000000 +0200
-+++ openmpi-1.4.5/orte/orted/orted_main.c 2012-02-22 17:14:09.000000000 +0100
+--- a/orte/orted/orted_main.c
++++ b/orte/orted/orted_main.c
@@ -199,7 +199,7 @@
int ret = 0;
int fd;
@@ -251,10 +235,8 @@
fd = open(log_path, O_RDWR|O_CREAT|O_TRUNC, 0640);
if (fd < 0) {
-Index: openmpi-1.4.5/orte/util/context_fns.c
-===================================================================
---- openmpi-1.4.5.orig/orte/util/context_fns.c 2009-12-08 21:36:44.000000000 +0100
-+++ openmpi-1.4.5/orte/util/context_fns.c 2012-02-22 17:14:09.000000000 +0100
+--- a/orte/util/context_fns.c
++++ b/orte/util/context_fns.c
@@ -56,10 +56,12 @@
{
bool good = true;
Modified: openmpi/branches/1.4/debian/patches/manpage_macros
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/manpage_macros?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/manpage_macros (original)
+++ openmpi/branches/1.4/debian/patches/manpage_macros Tue May 15 16:02:34 2012
@@ -5,12 +5,17 @@
Forwarded: yes
Last-Update: 2010-10-09
-Index: openmpi-1.4.5/ompi/mpi/man/man3/MPI_Init_thread.3in
-===================================================================
---- openmpi-1.4.5.orig/ompi/mpi/man/man3/MPI_Init_thread.3in 2012-01-30 22:27:46.000000000 +0100
-+++ openmpi-1.4.5/ompi/mpi/man/man3/MPI_Init_thread.3in 2012-02-22 17:16:36.000000000 +0100
+--- a/orte/tools/orterun/orterun.1in
++++ b/orte/tools/orterun/orterun.1in
@@ -1,4 +1,3 @@
-. -*- nroff -*-
- .\" Copyright 2006-2008 Sun Microsystems, Inc.
+ .\" Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
+ .\" Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
+ .\" Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+--- a/ompi/mpi/man/man3/MPI_Init_thread.3in
++++ b/ompi/mpi/man/man3/MPI_Init_thread.3in
+@@ -1,4 +1,3 @@
+-. -*- nroff -*-
+ .\"Copyright 2006-2008 Sun Microsystems, Inc.
.\" Copyright (c) 1996 Thinking Machines Corporation
.\" Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
Modified: openmpi/branches/1.4/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/series?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/series (original)
+++ openmpi/branches/1.4/debian/patches/series Tue May 15 16:02:34 2012
@@ -1,3 +1,5 @@
build_hurd
manpage_macros
+arm_support
missinglib.diff
+
Modified: openmpi/branches/1.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/rules?rev=302&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/rules (original)
+++ openmpi/branches/1.4/debian/rules Tue May 15 16:02:34 2012
@@ -175,6 +175,7 @@
dh_installdocs --all AUTHORS NEWS README
dh_installexamples -a
dh_installman -a
+ dh_lintian
dh_link -a
dh_strip -a --dbg-package=libopenmpi-dbg
dh_compress -a
More information about the Pkg-openmpi-commits
mailing list