[Pkg-openmpi-commits] r360 - in /openmpi/branches/experimental/debian: changelog control libopenmpi-dev.install libopenmpi-dev.links libopenmpi-dev.postinst openmpi-doc.install rules
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Tue Feb 2 13:23:45 UTC 2016
Author: mckinstry
Date: Tue Feb 2 13:23:45 2016
New Revision: 360
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=360
Log:
* Add missing links to .pc files in /usr/lib/pkgconfig
* Disable --with-verbs on kFreeBSD, Hurd.
* Update openmpi-docs man pages
* Add links for mpifort. Closes: #813060, #813057.
* Fix alternatives in postinst. Closes: #734096
* Delete torque deps in rules; Closes: #769578
* Close old bug - mpicc-wrapper data no longer contains /usr/lib.
Closes: #812991.
Modified:
openmpi/branches/experimental/debian/changelog
openmpi/branches/experimental/debian/control
openmpi/branches/experimental/debian/libopenmpi-dev.install
openmpi/branches/experimental/debian/libopenmpi-dev.links
openmpi/branches/experimental/debian/libopenmpi-dev.postinst
openmpi/branches/experimental/debian/openmpi-doc.install
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=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog (original)
+++ openmpi/branches/experimental/debian/changelog Tue Feb 2 13:23:45 2016
@@ -1,4 +1,17 @@
-openmpi (1.10.2-2) UNRELEASED; urgency=medium
+openmpi (1.10.2-3) unstable; urgency=medium
+
+ * Add missing links to .pc files in /usr/lib/pkgconfig
+ * Disable --with-verbs on kFreeBSD, Hurd.
+ * Update openmpi-docs man pages
+ * Add links for mpifort. Closes: #813060, #813057.
+ * Fix alternatives in postinst. Closes: #734096
+ * Delete torque deps in rules; Closes: #769578
+ * Close old bug - mpicc-wrapper data no longer contains /usr/lib.
+ Closes: #812991.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 01 Feb 2016 18:41:01 +0000
+
+openmpi (1.10.2-2) unstable; urgency=medium
* libopenmpi1.10 conflicts with libopenmpi1.6. Closes: #813042.
* Fixes for hppa, hurd patches.
@@ -8,7 +21,7 @@
* oshmem only supported on Linux, so only try to install on Linux, not
Hurd or KFreeBSD
- -- Alastair McKinstry <mckinstry at debian.org> Wed, 27 Jan 2016 18:42:59 +0000
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 29 Jan 2016 04:29:18 +0000
openmpi (1.10.2-1) experimental; urgency=medium
Modified: openmpi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/control?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/control (original)
+++ openmpi/branches/experimental/debian/control Tue Feb 2 13:23:45 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
+Build-Conflicts: libopenmpi1.6, libopenmpi1.10
Standards-Version: 3.9.6
Homepage: http://www.open-mpi.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
@@ -65,7 +65,7 @@
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, libopenmpi1.6
+Conflicts: libopenmpi1.6
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
@@ -106,16 +106,3 @@
This package contains man pages describing the Message Passing Interface
standard.
-# checkpoint disabled upstream due to loss of maintainer :-(
-#Package: openmpi-checkpoint
-#Architecture: amd64 armel armhf i386 powerpc
-#Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util, libopenmpi1.10 (= ${binary:Version})
-#Conflicts: openmpi-checkpoint
-#Description: high performance message passing library -- checkpoint support
-# 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 binaries needed for checkpointing Open MPI applications.
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.install?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.install (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.install Tue Feb 2 13:23:45 2016
@@ -11,6 +11,8 @@
usr/share/man/man1/mpif77.openmpi.1
usr/bin/mpif90.openmpi
usr/share/man/man1/mpif90.openmpi.1
+usr/bin/mpifort.openmpi
+usr/share/man/man1/mpifort.openmpi.1
usr/bin/opalc++
# usr/share/man/man1/opalc++.1
# NOTE: opalc++.1 is not provided upstream in 1.5.4
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.links?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.links (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.links Tue Feb 2 13:23:45 2016
@@ -19,3 +19,10 @@
usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so
## Convenience link for header files, see bug #493875
usr/lib/openmpi/include/ usr/include/openmpi
+# pkg-config
+usr/lib/openmpi/lib/pkgconfig/ompi-fort.pc usr/lib/pkgconfig/ompi-fort.pc
+usr/lib/openmpi/lib/pkgconfig/orte.pc usr/lib/pkgconfig/orte.pc
+usr/lib/openmpi/lib/pkgconfig/ompi.pc usr/lib/pkgconfig/ompi.pc
+usr/lib/openmpi/lib/pkgconfig/ompi-c.pc usr/lib/pkgconfig/ompi-c.pc
+usr/lib/openmpi/lib/pkgconfig/opal.pc usr/lib/pkgconfig/opal.pc
+usr/lib/openmpi/lib/pkgconfig/ompi-cxx.pc usr/lib/pkgconfig/ompi-cxx.pc
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.postinst?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.postinst (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.postinst Tue Feb 2 13:23:45 2016
@@ -6,20 +6,24 @@
--install /usr/include/mpi mpi /usr/lib/openmpi/include 50 \
--slave /usr/lib/libmpi.so libmpi.so /usr/lib/openmpi/lib/libmpi.so \
--slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/openmpi/lib/libmpi_cxx.so \
- --slave /usr/lib/libmpif77.so libmpif77.so /usr/lib/openmpi/lib/libmpi_f77.so \
- --slave /usr/lib/libmpif90.so libmpif90.so /usr/lib/openmpi/lib/libmpi_f90.so \
--slave /usr/bin/mpicc mpicc /usr/bin/mpicc.openmpi \
--slave /usr/bin/mpic++ mpic++ /usr/bin/mpic++.openmpi \
--slave /usr/bin/mpicxx mpicxx /usr/bin/mpic++.openmpi \
--slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.openmpi \
--slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.openmpi \
--slave /usr/bin/mpif90 mpif90 /usr/bin/mpif90.openmpi \
+ --slave /usr/bin/mpifort mpifort /usr/bin/mpifort.openmpi \
--slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz /usr/share/man/man1/mpicc.openmpi.1.gz \
--slave /usr/share/man/man1/mpic++.1.gz mpic++.1.gz /usr/share/man/man1/mpic++.openmpi.1.gz \
--slave /usr/share/man/man1/mpicxx.1.gz mpicxx.1.gz /usr/share/man/man1/mpicxx.openmpi.1.gz \
--slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz /usr/share/man/man1/mpiCC.openmpi.1.gz \
--slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz /usr/share/man/man1/mpif77.openmpi.1.gz \
- --slave /usr/share/man/man1/mpif90.1.gz mpif90.1.gz /usr/share/man/man1/mpif90.openmpi.1.gz
+ --slave /usr/share/man/man1/mpif90.1.gz mpif90.1.gz /usr/share/man/man1/mpif90.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpifort.1.gz mpifort.1.gz /usr/share/man/man1/mpifort.openmpi.1.gz \
+ --slave /usr/lib/pkgconfig/mpi.pc mpi.pc /usr/lib/pkgconfig/ompi.pc \
+ --slave /usr/lib/pkgconfig/mpi-fort.pc mpi-fort.pc /usr/lib/pkgconfig/ompi-fort.pc \
+ --slave /usr/lib/pkgconfig/mpi-c.pc mpi-c.pc /usr/lib/pkgconfig/ompi-c.pc \
+ --slave /usr/lib/pkgconfig/mpi-cxx.pc mpi-cxx.pc /usr/lib/pkgconfig/ompi-cxx.pc
#DEBHELPER#
Modified: openmpi/branches/experimental/debian/openmpi-doc.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-doc.install?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-doc.install (original)
+++ openmpi/branches/experimental/debian/openmpi-doc.install Tue Feb 2 13:23:45 2016
@@ -1,3 +1,6 @@
-#usr/share/man/man7/orte_filem.7
-#usr/share/man/man7/orte_hosts.7
-#usr/share/man/man7/orte_snapc.7
+usr/share/man/man7/orte_filem.7
+usr/share/man/man7/orte_hosts.7
+usr/share/man/man7/orte_snapc.7
+usr/share/man/man7/orte_sstore.7
+usr/share/man/man7/opal_crs.7
+usr/share/man/man7/ompi_crcp.7
Modified: openmpi/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/rules?rev=360&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/rules (original)
+++ openmpi/branches/experimental/debian/rules Tue Feb 2 13:23:45 2016
@@ -12,21 +12,17 @@
CFLAGS += -mcpu=v9
endif
-# Checkpointing disabled in 1.7+ due to loss of maintainer :-(
-# BLCR checkpointing support
-# BLCR_ARCH := "amd64 armel armhf i386 powerpc"
-BLCR_ARCH := ""
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(BLCR_ARCH)))
- CHKPT = --enable-ft-thread --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
-endif
-
# Memory affinity support
NUMA_ARCH := "amd64 i386 ia64 mips mipsel powerpc"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(NUMA_ARCH)))
NUMA = --with-libnuma=/usr --with-libnuma-libdir=/usr/lib
endif
-TORQUE = --without-tm
+# No ibverbs support available on kFreeBSD, Hurd
+NO_VERBS_ARCH:= "hurd-i386 kfreebsd-amd64 kfreebsd-i386"
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(NO_VERBS_ARCH)))
+ VERBS = --with-verbs
+endif
# Flags for the static build: see bug #502232
#STATIC_CONFIG_PARAMS = --enable-static
@@ -42,7 +38,7 @@
override_dh_auto_configure:
./autogen.sh
dh_auto_configure -- \
- $(CHKPT) $(NUMA) $(TORQUE) \
+ $(NUMA) $(VERBS) \
$(MPI_THREADS) \
$(STATIC_CONFIG_PARAMS) \
--disable-silent-rules \
@@ -51,8 +47,8 @@
--with-devel-headers \
--with-slurm \
--with-sge \
+ --without-tm \
--enable-heterogeneous \
- --with-verbs \
--disable-vt \
--sysconfdir=/etc/openmpi \
--libdir=\$${prefix}/lib/openmpi/lib \
More information about the Pkg-openmpi-commits
mailing list