[Pkg-openmpi-commits] r355 - in /openmpi/branches/experimental/debian: ./ patches/
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Wed Jan 27 09:12:16 UTC 2016
Author: mckinstry
Date: Wed Jan 27 09:12:15 2016
New Revision: 355
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=355
Log:
* New upstream release.
Closes: #753001, #796982, #796985, #659134, #657625, #584702,
Closes: #579505.
LP: #1365152, #1390198
* Patch refresh:
- ompi_autogen_sh.patch. Disabled as unnecessary
- fix-bashims.diff: upstream code removed
- fix-testsuite-compile : fixed upstream
- mips-support-upstream-1.7.3.diff: fixed upstream
- mips-support-fix.diff : ditto
- ppc64el-support.patch : ditto
* Change package names 1.6 -> 1.10
* Close Ophaning bug. Set myself as Maintainer, team as Uploaders.
Closes: #810079.
* Include HPPA support from Helge Deller. Closes: #776730.
* Replace __DATE__ with $(DEBIAN_VERSION) in debug output to make
build bit-reproducible.
* libopenmp1.6 recommends openmpi-common; needed for programs to run.
LP: #398095.
* Ack. that torque support is dropped. Closes: #767411. Presume that
openmpi will be informed if a new Torque is introduced to stretch,++.
* Set --with-ldtl=/usr/ not external; not detected otherwise ?
* Drop -dbg package as automatic -dbsym packages now generated.
Added:
openmpi/branches/experimental/debian/patches/hppa.patch
Modified:
openmpi/branches/experimental/debian/changelog
openmpi/branches/experimental/debian/control
openmpi/branches/experimental/debian/patches/alpha_badatomic.patch
openmpi/branches/experimental/debian/patches/arm_detection.diff
openmpi/branches/experimental/debian/patches/basic-arm64-support.diff
openmpi/branches/experimental/debian/patches/build_hurd
openmpi/branches/experimental/debian/patches/manpage_macros
openmpi/branches/experimental/debian/patches/mips-detection.diff
openmpi/branches/experimental/debian/patches/pkgconfig-vars.patch
openmpi/branches/experimental/debian/patches/ppc64el-support.patch
openmpi/branches/experimental/debian/patches/series
openmpi/branches/experimental/debian/rules
Modified: openmpi/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/changelog?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog (original)
+++ openmpi/branches/experimental/debian/changelog Wed Jan 27 09:12:15 2016
@@ -1,3 +1,31 @@
+openmpi (1.10.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ Closes: #753001, #796982, #796985, #659134, #657625, #584702,
+ Closes: #579505.
+ LP: #1365152, #1390198
+ * Patch refresh:
+ - ompi_autogen_sh.patch. Disabled as unnecessary
+ - fix-bashims.diff: upstream code removed
+ - fix-testsuite-compile : fixed upstream
+ - mips-support-upstream-1.7.3.diff: fixed upstream
+ - mips-support-fix.diff : ditto
+ - ppc64el-support.patch : ditto
+ * Change package names 1.6 -> 1.10
+ * Close Ophaning bug. Set myself as Maintainer, team as Uploaders.
+ Closes: #810079.
+ * Include HPPA support from Helge Deller. Closes: #776730.
+ * Replace __DATE__ with $(DEBIAN_VERSION) in debug output to make
+ build bit-reproducible.
+ * libopenmp1.6 recommends openmpi-common; needed for programs to run.
+ LP: #398095.
+ * Ack. that torque support is dropped. Closes: #767411. Presume that
+ openmpi will be informed if a new Torque is introduced to stretch,++.
+ * Set --with-ldtl=/usr/ not external; not detected otherwise ?
+ * Drop -dbg package as automatic -dbsym packages now generated.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 26 Jan 2016 11:23:11 +0000
+
openmpi (1.6.5-11) unstable; urgency=medium
* Build against gcc,gfortran5 for transition.
Modified: openmpi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/control?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/control (original)
+++ openmpi/branches/experimental/debian/control Wed Jan 27 09:12:15 2016
@@ -1,9 +1,9 @@
Source: openmpi
Section: net
Priority: extra
-Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
-Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>,
- Alastair McKinstry <mckinstry at debian.org>
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Uploaders: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>,
+ Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9),
libibverbs-dev (>= 1.1.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
gfortran, gcc (>= 4:5.2.1), chrpath, libhwloc-dev,
@@ -17,7 +17,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
Package: openmpi-bin
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 hppa powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
Conflicts: openmpi-bin
Suggests: gfortran, openmpi-checkpoint [amd64 armel armhf i386 powerpc]
@@ -46,8 +46,8 @@
Package: libopenmpi-dev
Section: libdevel
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6 (= ${binary:Version}), openmpi-common (= ${source:Version}),
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 hppa powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.10 (= ${binary:Version}), openmpi-common (= ${source:Version}),
libibverbs-dev (>= 1.1.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhwloc-dev
Conflicts: openmpi-dev, libopenmpi-dev, openmpi-bin (<= 1.2.4-0)
Description: high performance message passing library -- header files
@@ -60,9 +60,10 @@
This package contains the header files and compiler wrappers which are needed
to compile and link programs against libopenmpi.
-Package: libopenmpi1.6
+Package: libopenmpi1.10
Section: libs
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 hppa powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+Recommends: openmpi-bin
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: openmpi-libs0, libopenmpi1, libopenmpi1.3, libopenmpi2
Replaces: openmpi-checkpoint (<< 1.6.5-1)
@@ -107,20 +108,6 @@
This package contains man pages describing the Message Passing Interface
standard.
-Package: libopenmpi1.6-dbg
-Section: debug
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
-Depends: ${misc:Depends}, openmpi-bin (= ${binary:Version}), libopenmpi1.6 (= ${binary:Version})
-Conflicts: openmpi-dbg, libopenmpi-dbg
-Description: high performance message passing library -- debug 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
- MPI library available. A completely new MPI-2 compliant implementation, Open
- MPI offers advantages for system and software vendors, application developers
- and computer science researchers.
- .
- This package contains debugging symbols for Open MPI.
-
Package: openmpi-checkpoint
Architecture: amd64 armel armhf i386 powerpc
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util, libopenmpi1.6 (= ${binary:Version})
Modified: openmpi/branches/experimental/debian/patches/alpha_badatomic.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/alpha_badatomic.patch?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/alpha_badatomic.patch (original)
+++ openmpi/branches/experimental/debian/patches/alpha_badatomic.patch Wed Jan 27 09:12:15 2016
@@ -1,7 +1,7 @@
-Index: openmpi-1.6.5/opal/include/opal/sys/alpha/atomic.h
+Index: openmpi-1.10.2/opal/include/opal/sys/alpha/atomic.h
===================================================================
---- openmpi-1.6.5.orig/opal/include/opal/sys/alpha/atomic.h
-+++ openmpi-1.6.5/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
@@ -96,9 +96,7 @@ static inline int opal_atomic_cmpset_32(
"mov %3, %0 \n\t"
"stl_c %0, %1 \n\t"
Modified: openmpi/branches/experimental/debian/patches/arm_detection.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/arm_detection.diff?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/arm_detection.diff (original)
+++ openmpi/branches/experimental/debian/patches/arm_detection.diff Wed Jan 27 09:12:15 2016
@@ -1,8 +1,30 @@
-Index: openmpi-1.6.5/opal/config/opal_config_asm.m4
+Index: openmpi-1.10.2/configure
===================================================================
---- openmpi-1.6.5.orig/opal/config/opal_config_asm.m4 2013-07-01 09:47:08.000000000 +0200
-+++ openmpi-1.6.5/opal/config/opal_config_asm.m4 2013-07-01 09:47:07.000000000 +0200
-@@ -900,7 +900,7 @@
+--- openmpi-1.10.2.orig/configure
++++ openmpi-1.10.2/configure
+@@ -31355,7 +31355,7 @@ _ACEOF
+ OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
+ ;;
+
+- armv7*)
++ armv7*|arm-*-linux-gnueabihf)
+ ompi_cv_asm_arch="ARM"
+ OPAL_ASM_SUPPORT_64BIT=1
+ OPAL_ASM_ARM_VERSION=7
+@@ -31380,7 +31380,7 @@ _ACEOF
+ OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+ ;;
+
+- armv5*linux*|armv4*linux*)
++ armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
+ # 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
+===================================================================
+--- openmpi-1.10.2.orig/config/opal_config_asm.m4
++++ openmpi-1.10.2/config/opal_config_asm.m4
+@@ -817,7 +817,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
;;
@@ -11,7 +33,7 @@
ompi_cv_asm_arch="ARM"
OPAL_ASM_SUPPORT_64BIT=1
OPAL_ASM_ARM_VERSION=7
-@@ -919,7 +919,7 @@
+@@ -836,7 +836,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -20,25 +42,3 @@
# uses Linux kernel helpers for some atomic operations
ompi_cv_asm_arch="ARM"
OPAL_ASM_SUPPORT_64BIT=0
-Index: openmpi-1.6.5/configure
-===================================================================
---- openmpi-1.6.5.orig/configure 2013-07-01 09:47:08.000000000 +0200
-+++ openmpi-1.6.5/configure 2013-07-01 09:47:08.000000000 +0200
-@@ -27192,7 +27192,7 @@
- OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
- ;;
-
-- armv7*)
-+ armv7*|arm-*-linux-gnueabihf)
- ompi_cv_asm_arch="ARM"
- OPAL_ASM_SUPPORT_64BIT=1
- OPAL_ASM_ARM_VERSION=7
-@@ -27217,7 +27217,7 @@
- OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
- ;;
-
-- armv5*linux*|armv4*linux*)
-+ armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
- # uses Linux kernel helpers for some atomic operations
- ompi_cv_asm_arch="ARM"
- OPAL_ASM_SUPPORT_64BIT=0
Modified: openmpi/branches/experimental/debian/patches/basic-arm64-support.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/basic-arm64-support.diff?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/basic-arm64-support.diff (original)
+++ openmpi/branches/experimental/debian/patches/basic-arm64-support.diff Wed Jan 27 09:12:15 2016
@@ -15,28 +15,11 @@
create mode 100644 opal/include/opal/sys/arm64/atomic.h
create mode 100644 opal/include/opal/sys/arm64/timer.h
-Index: b/opal/config/opal_config_asm.m4
-===================================================================
---- a/opal/config/opal_config_asm.m4
-+++ b/opal/config/opal_config_asm.m4
-@@ -900,6 +900,12 @@
- OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
- ;;
-
-+ aarch64*)
-+ ompi_cv_asm_arch="ARM64"
-+ OPAL_ASM_SUPPORT_64BIT=1
-+ OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
-+ ;;
-+
- armv7*|arm-*-linux-gnueabihf)
- ompi_cv_asm_arch="ARM"
- OPAL_ASM_SUPPORT_64BIT=1
-Index: b/opal/include/opal/sys/Makefile.am
-===================================================================
---- a/opal/include/opal/sys/Makefile.am
-+++ b/opal/include/opal/sys/Makefile.am
-@@ -28,6 +28,7 @@
+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
+@@ -30,6 +30,7 @@ headers += \
include opal/sys/alpha/Makefile.am
include opal/sys/amd64/Makefile.am
include opal/sys/arm/Makefile.am
@@ -44,10 +27,10 @@
include opal/sys/ia32/Makefile.am
include opal/sys/ia64/Makefile.am
include opal/sys/mips/Makefile.am
-Index: b/opal/include/opal/sys/arm64/Makefile.am
+Index: openmpi-1.10.2/opal/include/opal/sys/arm64/Makefile.am
===================================================================
--- /dev/null
-+++ b/opal/include/opal/sys/arm64/Makefile.am
++++ openmpi-1.10.2/opal/include/opal/sys/arm64/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -73,10 +56,10 @@
+ opal/sys/arm64/atomic.h \
+ opal/sys/arm64/timer.h
+
-Index: b/opal/include/opal/sys/arm64/atomic.h
+Index: openmpi-1.10.2/opal/include/opal/sys/arm64/atomic.h
===================================================================
--- /dev/null
-+++ b/opal/include/opal/sys/arm64/atomic.h
++++ openmpi-1.10.2/opal/include/opal/sys/arm64/atomic.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -247,10 +230,10 @@
+}
+
+#endif /* ! OMPI_SYS_ARCH_ATOMIC_H */
-Index: b/opal/include/opal/sys/arm64/timer.h
+Index: openmpi-1.10.2/opal/include/opal/sys/arm64/timer.h
===================================================================
--- /dev/null
-+++ b/opal/include/opal/sys/arm64/timer.h
++++ openmpi-1.10.2/opal/include/opal/sys/arm64/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008 The University of Tennessee and The University
@@ -285,11 +268,11 @@
+#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
+
+#endif /* ! OMPI_SYS_ARCH_TIMER_H */
-Index: b/opal/include/opal/sys/atomic.h
-===================================================================
---- a/opal/include/opal/sys/atomic.h
-+++ b/opal/include/opal/sys/atomic.h
-@@ -148,6 +148,8 @@
+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
+@@ -152,6 +152,8 @@ typedef struct opal_atomic_lock_t opal_a
#include "opal/sys/amd64/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_ARM
#include "opal/sys/arm/atomic.h"
@@ -298,11 +281,11 @@
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA32
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
-Index: b/opal/include/opal/sys/timer.h
-===================================================================
---- a/opal/include/opal/sys/timer.h
-+++ b/opal/include/opal/sys/timer.h
-@@ -81,6 +81,8 @@
+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
#include "opal/sys/amd64/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OMPI_ARM
#include "opal/sys/arm/timer.h"
@@ -311,3 +294,20 @@
#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
+@@ -817,6 +817,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+ OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
+ ;;
+
++ aarch64*)
++ ompi_cv_asm_arch="ARM64"
++ OPAL_ASM_SUPPORT_64BIT=1
++ OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
++ ;;
++
+ armv7*|arm-*-linux-gnueabihf)
+ ompi_cv_asm_arch="ARM"
+ OPAL_ASM_SUPPORT_64BIT=1
Modified: openmpi/branches/experimental/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/build_hurd?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/build_hurd (original)
+++ openmpi/branches/experimental/debian/patches/build_hurd Wed Jan 27 09:12:15 2016
@@ -7,24 +7,26 @@
Forwarded: partially
Last-Update: 2013-08-21
---- a/ompi/runtime/ompi_mpi_abort.c
-+++ b/ompi/runtime/ompi_mpi_abort.c
-@@ -53,10 +53,11 @@
+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
+@@ -50,10 +50,11 @@ ompi_mpi_abort(struct ompi_communicator_
bool kill_remote_of_intercomm)
{
- int count = 0, i;
+ int count = 0, i, ret;
- char *msg, *host, hostname[MAXHOSTNAMELEN];
+ char *msg, *host = NULL;
pid_t pid = 0;
- orte_process_name_t *abort_procs;
- orte_std_cntr_t nabort_procs;
+ ompi_process_name_t *abort_procs;
+ int32_t nabort_procs;
+ bool free_host = false;
/* Protection for recursive invocation */
if (have_been_invoked) {
-@@ -70,8 +71,12 @@
- if (orte_initialized) {
- host = orte_process_info.nodename;
+@@ -66,8 +67,12 @@ ompi_mpi_abort(struct ompi_communicator_
+ if (ompi_mpi_initialized) {
+ host = ompi_process_info.nodename;
} else {
- gethostname(hostname, sizeof(hostname));
- host = hostname;
@@ -37,14 +39,16 @@
}
pid = getpid();
---- a/ompi/runtime/ompi_mpi_finalize.c
-+++ b/ompi/runtime/ompi_mpi_finalize.c
-@@ -101,13 +101,18 @@
+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
+@@ -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
to stderr. */
- char hostname[MAXHOSTNAMELEN];
-+ char *hostname = NULL;
++ char *hostname=NULL;
+ size_t hostname_length = 128;
pid_t pid = getpid();
- gethostname(hostname, sizeof(hostname));
@@ -53,19 +57,154 @@
+ hostname = realloc(hostname, hostname_length);
+ } while ((gethostname(hostname, hostname_length) == -1) && (errno == ENAMETOOLONG));
- orte_show_help("help-mpi-runtime.txt",
+ opal_show_help("help-mpi-runtime.txt",
"mpi_finalize:invoked_multiple_times",
true, hostname, pid);
+ free(hostname);
return MPI_ERR_OTHER;
}
---- a/opal/mca/base/mca_base_component_find.c
-+++ b/opal/mca/base/mca_base_component_find.c
-@@ -208,11 +208,16 @@
+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
+@@ -442,8 +442,12 @@ int opal_util_register_stackhandlers (vo
+ }
+
+ memset(&act, 0, sizeof(act));
++#ifdef SA_SIGINFO
+ act.sa_sigaction = show_stackframe;
+ act.sa_flags = SA_SIGINFO;
++#else
++ act.sa_handler = show_stackframe_handler;
++#endif
+ #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
+@@ -1109,7 +1109,12 @@ void orte_odls_base_default_launch_local
+ bool oversubscribed;
+ int rc=ORTE_SUCCESS;
+ orte_std_cntr_t proc_rank;
++
++#if !defined(MAXPATHLEN) && defined(__GLIBC__)
++ char *basedir=NULL;
++#else
+ char basedir[MAXPATHLEN];
++#endif
+ char **argvsav=NULL;
+ int inm, j, idx;
+ int total_num_local_procs = 0;
+@@ -1126,7 +1131,11 @@ void orte_odls_base_default_launch_local
+ * bouncing around as we execute various apps, but we will always return
+ * to this place as our default directory
+ */
++#if !defined(MAXPATHLEN) && defined(__GLIBC__)
++ basedir = get_current_dir_name();
++#else
+ getcwd(basedir, sizeof(basedir));
++#endif
+
+ /* 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(
+ int rc;
+ orte_app_context_t *app;
+ orte_job_t *jobdat;
++#if !defined(MAXPATHLEN) && defined(__GLIBC__)
++ char *basedir=NULL;
++ char *dir=NULL;
++#else
+ char basedir[MAXPATHLEN];
+-
++#endif
++
+ 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(
+ * bouncing around as we execute this app, but we will always return
+ * to this place as our default directory
+ */
++#if !defined(MAXPATHLEN) && defined(__GLIBC__)
++ basedir = get_current_dir_name();
++#else
+ getcwd(basedir, sizeof(basedir));
++#endif
+
+ /* 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
+@@ -62,6 +62,10 @@
+
+ /* for tons of debug output: -mca shmem_base_verbose 70 */
+
++#ifndef MAXHOSTNAMELEN
++# define MAXHOSTNAMELEN 256
++#endif
++
+ /* ////////////////////////////////////////////////////////////////////////// */
+ /*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
+@@ -45,6 +45,10 @@ BEGIN_C_DECLS
+ OPAL_DECLSPEC extern int shmem_posix_shm_open(char *posix_file_name_buff,
+ size_t size);
+
++#ifndef MAXHOSTNAMELEN
++# define MAXHOSTNAMELEN 256
++#endif
++
+ 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
+@@ -64,6 +64,10 @@
+
+ /* for tons of debug output: -mca shmem_base_verbose 70 */
+
++#ifndef MAXHOSTNAMELEN
++# define MAXHOSTNAMELEN 256
++#endif
++
+ /* ////////////////////////////////////////////////////////////////////////// */
+ /* 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
+ 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
+ ######################################################################
+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
+@@ -992,11 +992,16 @@ static int component_find_check (const c
}
- if (opal_list_get_end(found_components) == item) {
+ if (!found) {
- char h[MAXHOSTNAMELEN];
- gethostname(h, sizeof(h));
+ char *h = NULL;
@@ -73,220 +212,11 @@
+ do {
+ h_length *= 2;
+ h = realloc(h, h_length);
-+ } while ((gethostname(h, h_length) == -1) && (errno == ENAMETOOLONG));
++ } while ((gethostname(h, h_length) == -1) && (errno == ENAMETOOLONG));
opal_show_help("help-mca-base.txt",
"find-available:not-valid", true,
- h, type, requested_component_names[i]);
+ h, framework_name, requested_component_names[i]);
+ free(h);
return OPAL_ERR_NOT_FOUND;
}
}
---- 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();
-
- if(NULL == cwd) {
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ cwd = get_current_dir_name();
-+ if( NULL == cwd)
-+#else
- cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
-- if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
-+ if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) ))
-+#endif
-+ {
- opal_output(0, "Error: Unable to get the current working directory\n");
- cwd = strdup(".");
- }
---- a/opal/util/stacktrace.c
-+++ b/opal/util/stacktrace.c
-@@ -437,8 +437,12 @@
- mca_base_param_lookup_string (param, &string_value);
-
- memset(&act, 0, sizeof(act));
-+#ifdef SA_SIGINFO
- act.sa_sigaction = show_stackframe;
- act.sa_flags = SA_SIGINFO;
-+#else
-+ act.sa_handler = show_stackframe_handler;
-+#endif
- #ifdef SA_ONESHOT
- act.sa_flags |= SA_ONESHOT;
- #else
---- a/orte/mca/odls/base/odls_base_default_fns.c
-+++ b/orte/mca/odls/base/odls_base_default_fns.c
-@@ -1370,8 +1370,13 @@
- orte_local_rank_t local_rank;
- orte_node_rank_t node_rank;
- char *pathenv = NULL, *mpiexec_pathenv = NULL;
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ char *basedir=NULL;
-+ char *dir=NULL;
-+#else
- char basedir[MAXPATHLEN];
- char dir[MAXPATHLEN];
-+#endif
- char **argvptr;
- char *full_search;
- char **argvsav=NULL;
-@@ -1388,7 +1393,11 @@
- * bouncing around as we execute various apps, but we will always return
- * to this place as our default directory
- */
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ basedir = get_current_dir_name();
-+#else
- getcwd(basedir, sizeof(basedir));
-+#endif
-
- /* find the jobdat for this job */
- jobdat = NULL;
-@@ -1621,7 +1630,11 @@
- * again not match getcwd! This is beyond our control - we are only
- * ensuring they start out matching.
- */
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ dir = get_current_dir_name();
-+#else
- getcwd(dir, sizeof(dir));
-+#endif
- opal_setenv("PWD", dir, true, &app->env);
-
- /* Search for the OMPI_exec_path and PATH settings in the environment. */
-@@ -2118,6 +2131,10 @@
- GETOUT:
- opal_condition_signal(&orte_odls_globals.cond);
- OPAL_THREAD_UNLOCK(&orte_odls_globals.mutex);
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ free(basedir);
-+ free(dir);
-+#endif
- return rc;
- }
-
---- a/orte/orted/orted_main.c
-+++ b/orte/orted/orted_main.c
-@@ -228,7 +228,8 @@
- int ret = 0;
- int fd;
- opal_cmd_line_t *cmd_line = NULL;
-- char log_file[PATH_MAX];
-+ char *log_file = NULL;
-+ size_t log_file_len;
- char *jobidstring;
- char *rml_uri;
- int i;
-@@ -482,13 +483,16 @@
- }
-
- /* define a log file name in the session directory */
-- snprintf(log_file, PATH_MAX, "output-orted-%s-%s.log",
-+ log_file_len = 13 + strlen(jobidstring) + 1 + strlen(orte_process_info.nodename) + 4 + 1;
-+ log_file = malloc(log_file_len);
-+ snprintf(log_file, log_file_len, "output-orted-%s-%s.log",
- jobidstring, orte_process_info.nodename);
- log_path = opal_os_path(false,
- orte_process_info.tmpdir_base,
- orte_process_info.top_session_dir,
- log_file,
- NULL);
-+ free(log_file);
-
- fd = open(log_path, O_RDWR|O_CREAT|O_TRUNC, 0640);
- if (fd < 0) {
---- a/orte/util/context_fns.c
-+++ b/orte/util/context_fns.c
-@@ -55,10 +55,12 @@
- {
- bool good = true;
- const char *tmp;
-+#if 0 /* 'hostname' looks unused... */
- char hostname[MAXHOSTNAMELEN];
-
- /* Use hostname in a few messages below */
- gethostname(hostname, sizeof(hostname));
-+#endif
-
- /* If we want to chdir and the chdir fails (for any reason -- such
- as if the dir doesn't exist, it isn't a dir, we don't have
---- a/opal/mca/pstat/darwin/configure.m4
-+++ b/opal/mca/pstat/darwin/configure.m4
-@@ -23,9 +23,9 @@
- # -----------------------------------------------------------
- AC_DEFUN([MCA_pstat_darwin_CONFIG],[
- OMPI_VAR_SCOPE_PUSH([paff_darwin_happy])
-- # check to see if we have <mach/mach_host.h>
-+ # check to see if we have <mach/clock.h>
- # as this is a Darwin-specific thing
-- AC_CHECK_HEADER([mach/mach_host.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
-+ AC_CHECK_HEADER([mach/clock.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
-
- AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
- OMPI_VAR_SCOPE_POP
---- a/opal/mca/sysinfo/darwin/configure.m4
-+++ b/opal/mca/sysinfo/darwin/configure.m4
-@@ -12,9 +12,9 @@
- # -----------------------------------------------------------
- AC_DEFUN([MCA_sysinfo_darwin_CONFIG],[
- OMPI_VAR_SCOPE_PUSH([sysinfo_darwin_happy])
-- # check to see if we have <mach/mach_host.h>
-+ # check to see if we have <mach/clock.h>
- # as this is a Darwin-specific thing
-- AC_CHECK_HEADER([mach/mach_host.h], [sysinfo_darwin_happy=yes], [sysinfo_darwin_happy=no])
-+ AC_CHECK_HEADER([mach/clock.h], [sysinfo_darwin_happy=yes], [sysinfo_darwin_happy=no])
-
- AS_IF([test "$sysinfo_darwin_happy" = "yes"], [$1], [$2])
- OMPI_VAR_SCOPE_POP
---- a/opal/mca/shmem/mmap/shmem_mmap_module.c
-+++ b/opal/mca/shmem/mmap/shmem_mmap_module.c
-@@ -61,6 +61,10 @@
-
- /* for tons of debug output: -mca shmem_base_verbose 70 */
-
-+#ifndef MAXHOSTNAMELEN
-+# define MAXHOSTNAMELEN 256
-+#endif
-+
- /* ////////////////////////////////////////////////////////////////////////// */
- /*local functions */
- /* local functions */
---- a/opal/mca/shmem/posix/shmem_posix_common_utils.h
-+++ b/opal/mca/shmem/posix/shmem_posix_common_utils.h
-@@ -45,6 +45,10 @@
- OPAL_DECLSPEC extern int shmem_posix_shm_open(char *posix_file_name_buff,
- size_t size);
-
-+#ifndef MAXHOSTNAMELEN
-+# define MAXHOSTNAMELEN 256
-+#endif
-+
- END_C_DECLS
-
- #endif /* OPAL_SHMEM_POSIX_COMMON_UTILS_H */
---- a/opal/mca/shmem/sysv/shmem_sysv_module.c
-+++ b/opal/mca/shmem/sysv/shmem_sysv_module.c
-@@ -65,6 +65,10 @@
-
- /* for tons of debug output: -mca shmem_base_verbose 70 */
-
-+#ifndef MAXHOSTNAMELEN
-+# define MAXHOSTNAMELEN 256
-+#endif
-+
- /* ////////////////////////////////////////////////////////////////////////// */
- /* local functions */
- static int
---- a/opal/mca/memory/linux/configure.m4
-+++ b/opal/mca/memory/linux/configure.m4
-@@ -58,6 +58,10 @@
- [memory_linux_ptmalloc2_happy=yes
- 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
- ######################################################################
Added: openmpi/branches/experimental/debian/patches/hppa.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/hppa.patch?rev=355&op=file
==============================================================================
--- openmpi/branches/experimental/debian/patches/hppa.patch (added)
+++ openmpi/branches/experimental/debian/patches/hppa.patch Wed Jan 27 09:12:15 2016
@@ -0,0 +1,240 @@
+Author: Helge Deller <deller at gmx.de>
+Description: Support for the HPPA architecture
+Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776730
+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
+@@ -853,6 +853,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+ OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+ ;;
+
++ hppa*)
++ ompi_cv_asm_arch="HPPA"
++ OPAL_ASM_SUPPORT_64BIT=0
++ OMPI_GCC_INLINE_ASSIGN='"copy 0,%0" : "=&r"(ret)'
++ ;;
++
+ 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
+@@ -38,6 +38,7 @@
+ #define OMPI_SPARCV9_64 0062
+ #define OMPI_MIPS 0070
+ #define OMPI_ARM 0100
++#define OMPI_HPPA 0110
+ #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
+@@ -158,6 +158,8 @@ typedef struct opal_atomic_lock_t opal_a
+ #include "opal/sys/ia32/atomic.h"
+ #elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
+ #include "opal/sys/ia64/atomic.h"
++#elif OPAL_ASSEMBLY_ARCH == OMPI_HPPA
++#include "opal/sys/hppa/atomic.h"
+ #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
+===================================================================
+--- /dev/null
++++ openmpi-1.10.2/opal/include/opal/sys/hppa/atomic.h
+@@ -0,0 +1,95 @@
++/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
++/*
++ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
++ * University Research and Technology
++ * Corporation. All rights reserved.
++ * Copyright (c) 2004-2013 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 (c) 2011 Sandia National Laboratories. All rights reserved.
++ * Copyright (c) 2014 Los Alamos National Security, LLC. All rights
++ * reserved.
++ * $COPYRIGHT$
++ *
++ * Additional copyrights may follow
++ *
++ * $HEADER$
++ */
++
++#ifndef OPAL_SYS_ARCH_ATOMIC_H
++#define OPAL_SYS_ARCH_ATOMIC_H 1
++
++/**********************************************************************
++ *
++ * Memory Barriers
++ *
++ *********************************************************************/
++#define OPAL_HAVE_ATOMIC_MEM_BARRIER 1
++
++static inline void opal_atomic_mb(void)
++{
++ __sync_synchronize();
++}
++
++static inline void opal_atomic_rmb(void)
++{
++ __sync_synchronize();
++}
++
++static inline void opal_atomic_wmb(void)
++{
++ __sync_synchronize();
++}
++
++#if OPAL_WANT_SMP_LOCKS
++#define MB() opal_atomic_mb()
++#else
++#define MB()
++#endif
++
++/**********************************************************************
++ *
++ * Atomic math operations
++ *
++ *********************************************************************/
++
++#define OPAL_HAVE_ATOMIC_CMPSET_32 1
++static inline int opal_atomic_cmpset_acq_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_rel_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_32( volatile int32_t *addr,
++ + int32_t oldval, int32_t newval)
++{
++ return __sync_bool_compare_and_swap(addr, oldval, newval);
++}
++
++#define OPAL_HAVE_ATOMIC_MATH_32 1
++
++#define OPAL_HAVE_ATOMIC_ADD_32 1
++static inline int32_t opal_atomic_add_32(volatile int32_t *addr, int32_t delta)
++{
++ return __sync_add_and_fetch(addr, delta);
++}
++
++#define OPAL_HAVE_ATOMIC_SUB_32 1
++static inline int32_t opal_atomic_sub_32(volatile int32_t *addr, int32_t delta)
++{
++ return __sync_sub_and_fetch(addr, delta);
++}
++
++#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
+===================================================================
+--- /dev/null
++++ openmpi-1.10.2/opal/include/opal/sys/hppa/Makefile.am
+@@ -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/hppa/atomic.h \
++ opal/sys/hppa/timer.h
+Index: openmpi-1.10.2/opal/include/opal/sys/hppa/timer.h
+===================================================================
+--- /dev/null
++++ openmpi-1.10.2/opal/include/opal/sys/hppa/timer.h
+@@ -0,0 +1,33 @@
++/*
++ * 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
++
++
++typedef uint64_t opal_timer_t;
++
++static inline opal_timer_t
++opal_sys_timer_get_cycles(void)
++{
++ return 0;
++}
++
++#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
+ #include "opal/sys/ia32/timer.h"
+ #elif OPAL_ASSEMBLY_ARCH == OMPI_IA64
+ #include "opal/sys/ia64/timer.h"
++#elif OPAL_ASSEMBLY_ARCH == OMPI_HPPA
++#include "opal/sys/hppa/timer.h"
+ #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
+@@ -44,7 +44,7 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[
+ [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*|hppa*-*linux*)
+ AS_IF([test "$timer_linux_happy" = "yes"],
+ [AS_IF([test -r "/proc/cpuinfo"],
+ [timer_linux_happy="yes"],
Modified: openmpi/branches/experimental/debian/patches/manpage_macros
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/manpage_macros?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/manpage_macros (original)
+++ openmpi/branches/experimental/debian/patches/manpage_macros Wed Jan 27 09:12:15 2016
@@ -5,12 +5,12 @@
Forwarded: yes
Last-Update: 2011-09-13
-Index: openmpi-1.6.5/orte/tools/orterun/orterun.1in
+Index: openmpi-1.10.2/orte/tools/orterun/orterun.1in
===================================================================
---- openmpi-1.6.5.orig/orte/tools/orterun/orterun.1in 2013-07-01 09:46:41.000000000 +0200
-+++ openmpi-1.6.5/orte/tools/orterun/orterun.1in 2013-07-01 09:47:02.000000000 +0200
+--- openmpi-1.10.2.orig/orte/tools/orterun/orterun.1in
++++ openmpi-1.10.2/orte/tools/orterun/orterun.1in
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
- .\" Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
+ .\" Copyright (c) 2009-2014 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.
+ .\" $COPYRIGHT$
Modified: openmpi/branches/experimental/debian/patches/mips-detection.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/mips-detection.diff?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/mips-detection.diff (original)
+++ openmpi/branches/experimental/debian/patches/mips-detection.diff Wed Jan 27 09:12:15 2016
@@ -1,9 +1,11 @@
Description: Support detection of mips, mipsel, mips64, mips64el architectures
Author: Jurica Stanojkovic <Jurica.Stanojkovic at imgtec.com>
---- openmpi-1.6.5.orig/configure
-+++ openmpi-1.6.5/configure
-@@ -27231,8 +27231,13 @@ _ACEOF
+Index: openmpi-1.10.2/configure
+===================================================================
+--- openmpi-1.10.2.orig/configure
++++ openmpi-1.10.2/configure
+@@ -31394,8 +31394,13 @@ _ACEOF
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -19,9 +21,11 @@
# a MIPS III machine (r4000 and later)
ompi_cv_asm_arch="MIPS"
OPAL_ASM_SUPPORT_64BIT=1
---- openmpi-1.6.5.orig/opal/config/opal_config_asm.m4
-+++ openmpi-1.6.5/opal/config/opal_config_asm.m4
-@@ -930,8 +930,13 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
+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
+@@ -847,8 +847,13 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
;;
@@ -29,11 +33,11 @@
- # Should really find some way to make sure that we are on
+ mips-*|mipsel-*)
+ ompi_cv_asm_arch="MIPS"
-+ OPAL_ASM_SUPPORT_64BIT=0
-+ OMPI_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
-+ ;;
-+
-+ mips64-*|mips64el-*)
++ OPAL_ASM_SUPPORT_64BIT=0
++ OMPI_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
++ ;;
++
++ mips64-*|mips64el-*)
# a MIPS III machine (r4000 and later)
ompi_cv_asm_arch="MIPS"
OPAL_ASM_SUPPORT_64BIT=1
Modified: openmpi/branches/experimental/debian/patches/pkgconfig-vars.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/pkgconfig-vars.patch?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/pkgconfig-vars.patch (original)
+++ openmpi/branches/experimental/debian/patches/pkgconfig-vars.patch Wed Jan 27 09:12:15 2016
@@ -4,14 +4,14 @@
Last-Updated: 2014-10-07
Forwarded: no
-Index: openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
+Index: openmpi-1.10.2/ompi/tools/wrappers/ompi.pc.in
===================================================================
---- openmpi-1.6.5.orig/ompi/tools/wrappers/ompi.pc.in
-+++ openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
+--- openmpi-1.10.2.orig/ompi/tools/wrappers/ompi.pc.in
++++ openmpi-1.10.2/ompi/tools/wrappers/ompi.pc.in
@@ -15,7 +15,7 @@ libdir=@libdir@
# dependencies), so only list these in Libs.private.
#
- Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi
+ Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -lmpi
-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ -lmpi_f90 -lmpi_f77 -lmpi
#
Modified: openmpi/branches/experimental/debian/patches/ppc64el-support.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/ppc64el-support.patch?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/ppc64el-support.patch (original)
+++ openmpi/branches/experimental/debian/patches/ppc64el-support.patch Wed Jan 27 09:12:15 2016
@@ -1,14 +1,3 @@
Description: Attempt ppc64el build.
Author: Dimitri John Ledkov <xnox at ubuntu.com>
---- openmpi-1.6.5.orig/opal/config/opal_config_asm.m4
-+++ openmpi-1.6.5/opal/config/opal_config_asm.m4
-@@ -949,7 +949,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
- OMPI_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
- ;;
-
-- powerpc-*|powerpc64-*)
-+ powerpc-*|powerpc64-*|powerpc64le-*)
- OMPI_CHECK_POWERPC_REG
- if test "$ac_cv_sizeof_long" = "4" ; then
- ompi_cv_asm_arch="POWERPC32"
Modified: openmpi/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/series?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/series (original)
+++ openmpi/branches/experimental/debian/patches/series Wed Jan 27 09:12:15 2016
@@ -1,4 +1,4 @@
-ompi_autogen_sh.patch
+# ompi_autogen_sh.patch
build_hurd
manpage_macros
# ARM support is incorporated upstream
@@ -9,12 +9,14 @@
# 658600: Regression of bug 531522
#fix-fakeroot-execution.patch
arm_detection.diff
-fix-bashims.diff
-fix-testsuite-compile
+# fix-bashims.diff
+# fix-testsuite-compile
mips-detection.diff
-mips-support-upstream-1.7.3.diff
-mips-support-fix.diff
+#mips-support-upstream-1.7.3.diff
+# mips-support-fix.diff
basic-arm64-support.diff
-ppc64el-support.patch
+# ppc64el-support.patch
alpha_badatomic.patch
pkgconfig-vars.patch
+hppa.patch
+reproducible-build.patch
Modified: openmpi/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/rules?rev=355&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/rules (original)
+++ openmpi/branches/experimental/debian/rules Wed Jan 27 09:12:15 2016
@@ -2,8 +2,11 @@
# export DH_VERBOSE=1
+
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+
+DEBIAN_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\-.*\)/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
ifeq (sparc,$(DEB_HOST_GNU_CPU))
CFLAGS += -mcpu=v9
@@ -40,7 +43,7 @@
$(MPI_THREADS) \
--disable-silent-rules \
--with-hwloc=/usr/ \
- --with-libltdl=external \
+ --with-libltdl=/usr/ \
--with-devel-headers \
--with-slurm \
--with-sge \
@@ -48,7 +51,7 @@
--disable-vt \
--sysconfdir=/etc/openmpi \
--libdir=\$${prefix}/lib/openmpi/lib \
- --includedir=\$${prefix}/lib/openmpi/include
+ --includedir=\$${prefix}/lib/openmpi/include
override_dh_install:
# Strip rpath info from all executables and libraries.
@@ -86,6 +89,9 @@
# Continue as usual
dh_install
+override_dh_auto_test:
+ @echo "Tests ignored in this build"
+
override_dh_fixperms:
chmod 0644 debian/tmp/usr/lib/openmpi/lib/mpi.mod
dh_fixperms
@@ -95,6 +101,3 @@
override_dh_shlibdeps:
dh_shlibdeps -l$(CURDIR)/debian/tmp/usr/lib/openmpi/lib -- --ignore-missing-info
-
-override_dh_strip:
- dh_strip --dbg-package=libopenmpi1.6-dbg
More information about the Pkg-openmpi-commits
mailing list