[Pkg-openmpi-commits] r362 - in /openmpi/branches/experimental/debian: changelog control patches/build_hurd patches/series rules
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Mon Feb 8 06:56:34 UTC 2016
Author: mckinstry
Date: Mon Feb 8 06:56:33 2016
New Revision: 362
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=362
Log:
Prep for -6 release
Modified:
openmpi/branches/experimental/debian/changelog
openmpi/branches/experimental/debian/control
openmpi/branches/experimental/debian/patches/build_hurd
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=362&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog (original)
+++ openmpi/branches/experimental/debian/changelog Mon Feb 8 06:56:33 2016
@@ -1,3 +1,28 @@
+openmpi (1.10.2-6) UNRELEASED; urgency=medium
+
+ * libopenmpi-dev recommends openmpi-doc. Closes: #813929.
+ * Fix formatting errors in man pages. Silences lintian :-)
+ * Define PATH_MAX in ompi_config.h for Hurd.
+ * Change packages to Arch: any so s390x can build. Closes: #813734.
+ * Test suite enabled, so Closes: #719896.
+ * Close old bugs as we now support hppa, s390: Closes: #376833, #389306.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 06 Feb 2016 02:09:58 +0000
+
+openmpi (1.10.2-5) unstable; urgency=medium
+
+ * Do not use --with-verbs on s390x.
+ * Enable test suite. Do initial run as experimental to see what breaks :-(
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 05 Feb 2016 11:48:41 +0000
+
+openmpi (1.10.2-4) unstable; urgency=medium
+
+ * Change to Arch: any, as s390x, builds. Closes: #813694.
+ * Standards-Version: 3.9.7
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 04 Feb 2016 12:59:21 +0000
+
openmpi (1.10.2-3) unstable; urgency=medium
* Add missing links to .pc files in /usr/lib/pkgconfig
Modified: openmpi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/control?rev=362&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/control (original)
+++ openmpi/branches/experimental/debian/control Mon Feb 8 06:56:33 2016
@@ -11,13 +11,13 @@
libnuma-dev [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64el], autoconf (>= 2.59),
automake
Build-Conflicts: libopenmpi1.6, libopenmpi1.10
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
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/
Package: openmpi-bin
-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
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
Conflicts: openmpi-bin
Suggests: gfortran, openmpi-checkpoint [amd64 armel armhf i386 powerpc]
@@ -46,10 +46,11 @@
Package: libopenmpi-dev
Section: libdevel
-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
+Architecture: any
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)
+Suggests: opennmpi-doc
Description: high performance message passing library -- header files
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
@@ -62,7 +63,7 @@
Package: libopenmpi1.10
Section: libs
-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
+Architecture: any
Recommends: openmpi-bin
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libopenmpi1.6
Modified: openmpi/branches/experimental/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/build_hurd?rev=362&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/build_hurd (original)
+++ openmpi/branches/experimental/debian/patches/build_hurd Mon Feb 8 06:56:33 2016
@@ -220,17 +220,33 @@
return OPAL_ERR_NOT_FOUND;
}
}
+Index: openmpi-1.10.2/ompi/include/ompi_config.h
+===================================================================
+--- openmpi-1.10.2.orig/ompi/include/ompi_config.h
++++ openmpi-1.10.2/ompi/include/ompi_config.h
+@@ -26,6 +26,10 @@
+
+ #include "opal_config.h"
+
++#ifndef PATH_MAX /* Hurd */
++#define PATH_MAX 65535
++#endif
++
+ #define OMPI_IDENT_STRING OPAL_IDENT_STRING
+
+ /***********************************************************************
Index: openmpi-1.10.2/opal/mca/base/mca_base_var.c
===================================================================
--- openmpi-1.10.2.orig/opal/mca/base/mca_base_var.c
+++ openmpi-1.10.2/opal/mca/base/mca_base_var.c
-@@ -50,6 +50,9 @@
+@@ -50,6 +50,10 @@
#include "opal/util/opal_environ.h"
#include "opal/runtime/opal.h"
-+#ifndef MAXPATHLEN /* hurd */
-+#define MAXPATHLEN 2048
-+#endif
++#ifndef PATH_MAX /* Hurd */
++#define PATH_MAX 2048
++#endif
++
/*
* local variables
*/
Modified: openmpi/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/series?rev=362&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/series (original)
+++ openmpi/branches/experimental/debian/patches/series Mon Feb 8 06:56:33 2016
@@ -1,22 +1,9 @@
-# ompi_autogen_sh.patch
build_hurd
manpage_macros
-# ARM support is incorporated upstream
-#arm_support
-# Link fix is obsolete, since we do not ship .la files anymore
-#openmpi-link-fix
-#configure_arm_fix.patch
-# 658600: Regression of bug 531522
-#fix-fakeroot-execution.patch
arm_detection.diff
-# fix-bashims.diff
-# fix-testsuite-compile
mips-detection.diff
-#mips-support-upstream-1.7.3.diff
-# mips-support-fix.diff
basic-arm64-support.diff
-# ppc64el-support.patch
alpha_badatomic.patch
-# pkgconfig-vars.patch
hppa.patch
reproducible-build.patch
+fix-man-pages.patch
Modified: openmpi/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/rules?rev=362&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/rules (original)
+++ openmpi/branches/experimental/debian/rules Mon Feb 8 06:56:33 2016
@@ -2,7 +2,7 @@
export DH_VERBOSE=1
-
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -19,7 +19,7 @@
endif
# No ibverbs support available on kFreeBSD, Hurd
-NO_VERBS_ARCH:= "hurd-i386 kfreebsd-amd64 kfreebsd-i386"
+NO_VERBS_ARCH:= "hurd-i386 kfreebsd-amd64 kfreebsd-i386 s390x"
ifeq (,$(findstring $(DEB_HOST_ARCH),$(NO_VERBS_ARCH)))
VERBS = --with-verbs
endif
@@ -58,7 +58,6 @@
# Strip rpath info from all executables and libraries.
find debian/tmp/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;
# Rename the compiler and startup wrappers.
-## for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun opalc++ opalcc ortec++ ortecc orteCC ; do \ ##
for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun mpifort ; do \
if test -f debian/tmp/usr/bin/$${f}; then \
mv debian/tmp/usr/bin/$${f} debian/tmp/usr/bin/$${f}.openmpi ; \
@@ -113,13 +112,6 @@
cp -a debian/tmp/usr/share/man/man1/shmemcc.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
cp -a debian/tmp/usr/share/man/man1/shmemfort.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
fi
- if test -f debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; then \
- cp -a debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 \
- debian/libopenmpi1.10/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; \
- fi
-
-override_dh_auto_test:
- @echo "Tests ignored in this build"
override_dh_fixperms:
chmod 0644 debian/libopenmpi*/usr/lib/openmpi/lib/*.mod
More information about the Pkg-openmpi-commits
mailing list