[Pkg-openmpi-commits] r351 - in /openmpi/trunk/debian: changelog compat control libopenmpi-dev.install patches/alpha_badatomic.patch patches/pkgconfig-vars.patch patches/series rules source/options
mmilligan-guest at users.alioth.debian.org
mmilligan-guest at users.alioth.debian.org
Fri Sep 11 19:08:41 UTC 2015
Author: mmilligan-guest
Date: Fri Sep 11 19:08:41 2015
New Revision: 351
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=351
Log:
synchronize to 1.6.5-11 in archive
Added:
openmpi/trunk/debian/patches/alpha_badatomic.patch
openmpi/trunk/debian/patches/pkgconfig-vars.patch
openmpi/trunk/debian/source/options
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/compat
openmpi/trunk/debian/control
openmpi/trunk/debian/libopenmpi-dev.install
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/rules
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Fri Sep 11 19:08:41 2015
@@ -1,11 +1,44 @@
-openmpi (1.6.5-9) UNRELEASED; urgency=low
-
- * Install pkg-config files (*.pc) into /usr/lib/pkgconfig. Thanks to
- Gilles Filippini for the patch! Closes: #734096.
- * Fix two incorrect soname links. Thanks to Andreas Beckmann for the
- patch! Closes: #736675.
-
- -- Manuel Prinz <manuel at debian.org> Sat, 01 Mar 2014 18:25:02 +0100
+openmpi (1.6.5-11) unstable; urgency=medium
+
+ * Build against gcc,gfortran5 for transition.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 10 Aug 2015 07:55:56 +0100
+
+openmpi (1.6.5-10) unstable; urgency=medium
+
+ * Acknowledge taking maintainership. Closes: #766859.
+ * Ack. patch from Willi Mann that fixes FTBFS. Closes: #782653.
+ * Move to debhelper compatabililty level 9.
+ * Use 'xz' compression
+ * Depend on libibverbs >= 1.1.7 for libibverbs ABI change (From Ubuntu)
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 22 Jun 2015 18:56:29 +0100
+
+openmpi (1.6.5-9.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * libopenmpi1.6: Fix two incorrect soname links. (Closes: #736675)
+ * openmpi-common: Set Multi-Arch: foreign. (Closes: #769378)
+
+ -- Andreas Beckmann <anbe at debian.org> Tue, 25 Nov 2014 12:42:38 +0100
+
+openmpi (1.6.5-9.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable torque support (see #767411).
+
+ -- Julien Cristau <jcristau at debian.org> Fri, 14 Nov 2014 17:57:11 +0100
+
+openmpi (1.6.5-9) unstable; urgency=medium
+
+ * Add myself as uploader.
+ * Standards-Version: 3.9.6; no changes required.
+ * Rebuild against lastest gfortran. Closes: #647908, #675115.
+ * Patch for mpi.pc support. Closes: #752785.
+ * Patch from Michael Cree to fix bad atomic ops on Alpha that
+ causes mpi4py to segfault. Closes: #754524.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 28 Oct 2014 11:07:44 +0000
openmpi (1.6.5-8) unstable; urgency=low
Modified: openmpi/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/compat?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/compat (original)
+++ openmpi/trunk/debian/compat Fri Sep 11 19:08:41 2015
@@ -1 +1 @@
-8
+9
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Fri Sep 11 19:08:41 2015
@@ -2,15 +2,16 @@
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>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.0.0~),
- libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- gfortran, gcc (>= 4:4.1.2), chrpath, libhwloc-dev, libtorque2-dev,
+Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>,
+ Alastair McKinstry <mckinstry 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,
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.3
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.open-mpi.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
@@ -46,7 +47,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}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhwloc-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6 (= ${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
Open MPI is a project combining technologies and resources from several other
@@ -76,6 +78,7 @@
Package: openmpi-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Conflicts: openmpi-common
Description: high performance message passing library -- common files
Modified: openmpi/trunk/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.install?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.install (original)
+++ openmpi/trunk/debian/libopenmpi-dev.install Fri Sep 11 19:08:41 2015
@@ -32,4 +32,4 @@
## .so symlinks
usr/lib/openmpi/lib/*.so
## pkg-config .pc files
-usr/lib/openmpi/lib/pkgconfig/*.pc usr/lib/pkgconfig
+usr/lib/openmpi/lib/pkgconfig/*.pc
Added: openmpi/trunk/debian/patches/alpha_badatomic.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/alpha_badatomic.patch?rev=351&op=file
==============================================================================
--- openmpi/trunk/debian/patches/alpha_badatomic.patch (added)
+++ openmpi/trunk/debian/patches/alpha_badatomic.patch Fri Sep 11 19:08:41 2015
@@ -0,0 +1,26 @@
+Index: openmpi-1.6.5/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
+@@ -96,9 +96,7 @@ static inline int opal_atomic_cmpset_32(
+ "mov %3, %0 \n\t"
+ "stl_c %0, %1 \n\t"
+ "beq %0, 1b \n\t"
+- "jmp 3f \n"
+- "2: mov $31, %0 \n"
+- "3: \n"
++ "2: \n"
+ : "=&r" (ret), "+m" (*addr)
+ : "r" (oldval), "r" (newval)
+ : "memory");
+@@ -141,9 +139,7 @@ static inline int opal_atomic_cmpset_64(
+ "mov %3, %0 \n\t"
+ "stq_c %0, %1 \n\t"
+ "beq %0, 1b \n\t"
+- "jmp 3f \n"
+- "2: mov $31, %0 \n"
+- "3: \n"
++ "2: \n"
+ : "=&r" (ret), "+m" (*addr)
+ : "r" (oldval), "r" (newval)
+ : "memory");
Added: openmpi/trunk/debian/patches/pkgconfig-vars.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/pkgconfig-vars.patch?rev=351&op=file
==============================================================================
--- openmpi/trunk/debian/patches/pkgconfig-vars.patch (added)
+++ openmpi/trunk/debian/patches/pkgconfig-vars.patch Fri Sep 11 19:08:41 2015
@@ -0,0 +1,28 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752785
+Description: Add variables needed to make mpi.pc an alias for ompi.pc
+Last-Updated: 2014-10-07
+Forwarded: no
+
+Index: openmpi-1.6.5/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
+@@ -15,7 +15,7 @@ libdir=@libdir@
+ # dependencies), so only list these in Libs.private.
+ #
+ Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi
+-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
++Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ -lmpi_f90 -lmpi_f77 -lmpi
+ #
+ # It is safe to hard-wire the -I before the EXTRA_INCLUDES because it
+ # will either contain "openmpi" or be blank. Hence, it'll either
+@@ -23,3 +23,8 @@ Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+ # redundant (ick), but safe.
+ #
+ Cflags: -I${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@
++#
++# Add variables to be queried in specific cases. Match variables in mpich.pc
++cxxflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@
++fcflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@
++fflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FFLAGS@
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Fri Sep 11 19:08:41 2015
@@ -16,3 +16,5 @@
mips-support-fix.diff
basic-arm64-support.diff
ppc64el-support.patch
+alpha_badatomic.patch
+pkgconfig-vars.patch
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=351&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Fri Sep 11 19:08:41 2015
@@ -20,6 +20,8 @@
ifneq (,$(findstring $(DEB_HOST_ARCH),$(NUMA_ARCH)))
NUMA = --with-libnuma=/usr --with-libnuma-libdir=/usr/lib
endif
+
+TORQUE = --without-tm
# Flags for the static build: see bug #502232
#STATIC_CONFIG_PARAMS = --enable-static
Added: openmpi/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/source/options?rev=351&op=file
==============================================================================
--- openmpi/trunk/debian/source/options (added)
+++ openmpi/trunk/debian/source/options Fri Sep 11 19:08:41 2015
@@ -0,0 +1 @@
+compression = "xz"
More information about the Pkg-openmpi-commits
mailing list