diff -pruN 5.0.5-5/debian/changelog 5.0.5-6/debian/changelog --- 5.0.5-5/debian/changelog 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/changelog 2024-11-16 05:48:44.000000000 +0000 @@ -1,14 +1,13 @@ -openmpi (5.0.5-5) experimental; urgency=medium +openmpi (5.0.5-6) unstable; urgency=medium * libmca_* not shipped; delete broken symlinks * Fix other broken symlinks: docs,etc * Correct paths in mpi wrappers. Closes: #1086209, #10870100 + * Update d/tests/* for pkgconf tests * Drop rpath from libs. Closes: #1085509 - * Drop Provides: as incorrect - * Change remaining refs to openmpi3->openmpi40 * Update README.Debian - -- Alastair McKinstry Sat, 09 Nov 2024 06:29:12 +0000 + -- Alastair McKinstry Sat, 16 Nov 2024 06:29:12 +0000 openmpi (5.0.5-4) experimental; urgency=medium @@ -25,10 +24,6 @@ openmpi (5.0.5-3) unstable; urgency=medi * Ensure files not installed in a binary-indep build are listed in d/not-installed. Closes: #1085151 - * Fix 2 links that were not updated - libmpi.so.40.40.5 - libmpi_usempif08-gfortran.so.40.40.2 - * Drop obsolete refs to kfreebsd-i386 in d/control -- Alastair McKinstry Wed, 16 Oct 2024 11:03:15 +0100 @@ -36,103 +31,82 @@ openmpi (5.0.5-2) unstable; urgency=medi * Push to unstable for pseudo-transition. Closes: #1078212 - -- Alastair McKinstry Sun, 13 Oct 2024 17:53:18 +0100 +openmpi (4.1.6-13) unstable; urgency=medium -openmpi (5.0.5-1) experimental; urgency=medium + * Move pmix help files to libopenmpi3t64, not openmpi3-common - * New upstream release - * Ack old bug fixed: Closes: #1070985 + -- Alastair McKinstry Sat, 27 Apr 2024 17:37:26 +0100 - -- Alastair McKinstry Wed, 24 Jul 2024 07:48:34 +0100 +openmpi (4.1.6-12) unstable; urgency=medium -openmpi (5.0.4-1) experimental; urgency=medium + * Use Conflicts/Provides/Replaces libpmix2. Closes: #1068735 + * Patch from Adrian Bunk for atomics. - * New upstream release - * libs change: - libmpi.so.40.40.3 -> libmpi.so.40.40.4 - libmpi_usempif08.so.40.40.1 -> libmpi_usempif08.so.40.40.2 - libopen-pal.so.80.0.3 -> libopen-pal.so.80.0.4 - liboshmem.so.40.40.2 -> liboshmem.so.40.40.3 - libprrte.so.3.0.5 -> libprrte.so.3.0.6 + -- Alastair McKinstry Wed, 17 Apr 2024 14:45:23 +0100 - -- Alastair McKinstry Tue, 23 Jul 2024 08:56:29 +0100 +openmpi (4.1.6-11) unstable; urgency=medium -openmpi (5.0.3-3) experimental; urgency=medium + * Ship help text files for pmix. Closes: #1069106 - * Add t64 transition changes to 5.0.3 version; Closes: #1064263 - * S-V: 4.7.0; no changes required - * Make science team the Maintainer + -- Alastair McKinstry Wed, 17 Apr 2024 11:15:11 +0100 - -- Alastair McKinstry Mon, 13 May 2024 15:33:51 +0100 +openmpi (4.1.6-10) unstable; urgency=medium -openmpi (5.0.3-2) experimental; urgency=medium + * libopenmpi3t64 breaks/replaces libpmix2t64 not libpmix2. + Closes: #1068735 - * Rename /usr/bin/pterm to pterm.openmpi. Closes: #1056054, #1068808 + -- Alastair McKinstry Thu, 11 Apr 2024 10:25:06 +0100 - -- Alastair McKinstry Thu, 11 Apr 2024 16:16:39 +0100 +openmpi (4.1.6-9) unstable; urgency=medium -openmpi (5.0.3-1) experimental; urgency=medium + * Ship pmix on 32-bit systems; ensure we break/depend on libpmix on 32-bit + systems. Closes: #1067784, #1068612 - * New upstream release - * Ensure mpiexec.openmpi -> mpirun.openmpi not mpirun, as mpirun may - be redirected by alternatives - * pcc no longer shipped? - * libs change: - libopen-pal.so.80.0.2 -> libopen-pal.so.80.0.3 - libprrte.so.3.0.3 -> libprrte.so.3.0.5 - liboshmem.so.40.40.1 -> liboshmem.so.40.40.2 - libmpi.so.40.40.2 -> 40.40.3 + -- Alastair McKinstry Tue, 09 Apr 2024 09:17:18 +0100 - -- Alastair McKinstry Wed, 10 Apr 2024 14:29:18 +0100 +openmpi (4.1.6-8) unstable; urgency=medium -openmpi (5.0.2-1) experimental; urgency=medium + * Only dep on libpmix on 64-bit systems. + * Disable modules that need 64-bit atomic ops on 32-bit systems. + Closes: #1067055 - * New upstream release - * libs change: - liboshmem.so.40.40.0 -> liboshmem.so.40.40.1 - libopen-pal.so.80.0.0 -> libopen-pal.so.80.0.2 - libprrte.so.3.0.2 -> libprrte.so.3.0.3 - libmpi.so.40.40.0 -> 40.40.2 - libmpi_usempif08.so.40.40.0 -> libmpi_usempif08.so.40.40.1 - * B-D on architecture-is-64-bit. No longer support 32-bit systems - * libopenmpi-dev.postinst.in: drop mpic++ links for >= 5.0.0 - * autopkg tests must not have underscores in names - * Add pkgconfi to tests - * libopenmpi-dev deps on fortran:Depends + -- Alastair McKinstry Wed, 03 Apr 2024 14:34:22 +0100 - -- Alastair McKinstry Sat, 10 Feb 2024 12:25:11 +0000 +openmpi (4.1.6-7) unstable; urgency=medium -openmpi (5.0.1-1) experimental; urgency=medium + * Drop hard-coded pmix2 dependency. Closes: #1066885 - * New upstream release - * libs change: - libprrte.so.3.0.2 -> libprrte.so.3.0.3 - libopen-pal.so.80.0.0 -> libopen-pal.so.80.0.1 - liboshmem.so.40.40.0 -> liboshmem.so.40.40.1 + -- Alastair McKinstry Fri, 15 Mar 2024 06:14:07 +0000 - -- Alastair McKinstry Fri, 05 Jan 2024 16:34:38 +0000 +openmpi (4.1.6-6) unstable; urgency=medium -openmpi (5.0.0-1) experimental; urgency=medium + * Patch from Zixing Liu to change libnames in d/rules for t64 transition. + Closes: #1066834 - * New upstream release - * libs change: - liboshmem.so.40.30.3 -> liboshmem.so.40.40.0 - libmpi_java: 40.30.0 -> libmpi_java.so.40.40.0 - libopen-pal.40.30.3 -> libopen-pal.80.0.0 - libmpi.so.40.30.6 -> libmpi.so.40.40.0 - libmpifh.so.40.40.0 -> libmpifh.40.40.0 - libmpi_usempif08.so.40.30.0 -> libmpi_usempif08.so.40.40.0 - libmpi_usempi_ignore_tkr.so.40.30.0 -> libmpi_usempi_ignore_tkr.so.40.40.0 - libompitrace.so.40.30.1 -> libompitrace.so.40.40.0 - libopen-rte.so.40.30.3 no longer shipped - libmca_* no longer shipped - Now ship libprrte.so.3.0.2 + -- Alastair McKinstry Thu, 14 Mar 2024 08:19:07 +0000 - * Patch for hurd-amd64 thanks to Sam Thibault. Closes: #1055425 - * Disable C++ support - dropped from MPI standard - * B-D on python3-sphinx-rtd-theme, python3-recommonmark for docs +openmpi (4.1.6-5.1) unstable; urgency=medium - -- Alastair McKinstry Tue, 14 Nov 2023 19:17:54 +0000 + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1064263 + + -- Benjamin Drung Thu, 29 Feb 2024 12:37:33 +0000 + +openmpi (4.1.6-5) unstable; urgency=medium + + * Ensure pkg-config is present for autopkgtests + + -- Alastair McKinstry Mon, 01 Jan 2024 17:14:56 +0000 + +openmpi (4.1.6-4) unstable; urgency=medium + + * Revert FMODDIR to libdir via dh-fortran-mod >= 0.31. + Closes: #1058876 + * Add fortran-suppport.mk + * Add fortran:Depends, fortran:Recommends to libopenmpi-dev + * Depend on dh-fortran-mod (>= 0.31) + + -- Alastair McKinstry Mon, 01 Jan 2024 17:14:39 +0000 openmpi (4.1.6-3) unstable; urgency=medium diff -pruN 5.0.5-5/debian/control 5.0.5-6/debian/control --- 5.0.5-5/debian/control 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/control 2024-11-15 16:19:59.000000000 +0000 @@ -10,12 +10,12 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libevent-dev, libpmix-dev, - libucx-dev [amd64 arm64 ppc64el riscv64], + libucx-dev [amd64 arm64 ppc64el], zlib1g-dev, gfortran, libhwloc-dev, - pkgconf, - libibverbs-dev (>= 1.1.7) [!kfreebsd-amd64 !hurd-any], + pkg-config, + libibverbs-dev (>= 1.1.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], libfabric-dev [!kfreebsd-amd64 !hurd-any], libnuma-dev [!kfreebsd-amd64 !hurd-any], libpsm-infinipath1-dev [amd64], @@ -70,10 +70,10 @@ Package: libopenmpi-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, ${fortran:Depends}, - libopenmpi40 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, ${fortran:Depends}, + libopenmpi3t64 (= ${binary:Version}), openmpi-common (>= ${source:Version}), - libibverbs-dev (>= 1.1.7) [!kfreebsd-amd64 !hurd-any], libhwloc-dev, + libibverbs-dev (>= 1.1.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], libhwloc-dev, libevent-dev, libpmix-dev, libjs-jquery, @@ -96,16 +96,16 @@ Description: high performance message pa This package contains the header files and compiler wrappers which are needed to compile and link programs against libopenmpi. -Package: libopenmpi40 +Package: libopenmpi3t64 Section: libs Architecture: any Multi-Arch: same +Provides: ${t64:Provides} Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc-plugins, libpmix2 -Breaks: libopenmpi3 (<< ${source:Version}), libopenmpi3t64 (<< ${source:Version}), - gromacs-openmpi (<< 2020~beta2-2), +Breaks: libopenmpi3 (<< ${source:Version}), gromacs-openmpi (<< 2020~beta2-2), libeztrace0 (<< 1.1-8-5+b1), starpu-contrib-examples (<< 1.3.2+dfsg-2+b1), starpu-examples (<< 1.3.2+dfsg-4+b1) -Replaces: libopenmpi3, libopenmpi3t64 +Replaces: libopenmpi3 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 @@ -133,8 +133,7 @@ Package: openmpi-doc Section: doc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, libjs-jquery-ui, libjs-jquery, - fonts-font-awesome +Depends: ${misc:Depends}, libjs-jquery-ui Conflicts: mpi-doc, lam-mpidoc, lam4-dev, openmpi-doc Replaces: libopenmpi-dev (<< 4.1.2~rc1-4) Breaks: libopenmpi-dev (<< 4.1.2~rc1-4) diff -pruN 5.0.5-5/debian/libopenmpi-dev.links 5.0.5-6/debian/libopenmpi-dev.links --- 5.0.5-5/debian/libopenmpi-dev.links 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi-dev.links 2024-11-15 16:19:59.000000000 +0000 @@ -1,5 +1,5 @@ ## SONAME symlinks -/usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libmpi.so +usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libmpi.so #usr/lib/${DEB_HOST_MULTIARCH}/libmca_common_monitoring.so.50 usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libmca_common_monitoring.so #usr/lib/${DEB_HOST_MULTIARCH}/libmca_common_sm.so.40 usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libmca_common_sm.so usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40 usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libmpi_mpifh.so @@ -20,7 +20,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/openmpi/in # pkg-config usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/ompi-fort.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ompi-fort.pc usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/ompi-f77.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ompi-f77.pc -usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/orte.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/orte.pc usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/ompi.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ompi.pc usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/ompi-c.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ompi-c.pc usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/pkgconfig/opal.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/opal.pc diff -pruN 5.0.5-5/debian/libopenmpi3t64.install 5.0.5-6/debian/libopenmpi3t64.install --- 5.0.5-5/debian/libopenmpi3t64.install 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi3t64.install 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,11 @@ +# Shared libraries +usr/lib/*/openmpi/lib/libprrte.so.3.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libmpi_mpifh*.so.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libmpi_usempif08*.so.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libmpi_usempi_ignore_tkr*.so.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libmpi.so.* /usr/lib/${DEB_HOST_MULTIARCH} +# usr/lib/*/openmpi/lib/libompitrace.so.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libopen-pal.so.* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/*/openmpi/lib/libprrte.so.* +## Plugins +usr/lib/*/openmpi/lib/openmpi3/*.so diff -pruN 5.0.5-5/debian/libopenmpi3t64.links 5.0.5-6/debian/libopenmpi3t64.links --- 5.0.5-5/debian/libopenmpi3t64.links 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi3t64.links 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,12 @@ +# Compatibility links to /usr/bin +# SONAME symlinks +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40.40.4 usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40.40.2 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40 +# usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40.40.0 +usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.80.0.4 usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.80 +usr/lib/${DEB_HOST_MULTIARCH}/libprrte.so.3.0.6 usr/lib/${DEB_HOST_MULTIARCH}/libprrte.so.3 diff -pruN 5.0.5-5/debian/libopenmpi3t64.lintian-overrides 5.0.5-6/debian/libopenmpi3t64.lintian-overrides --- 5.0.5-5/debian/libopenmpi3t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi3t64.lintian-overrides 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1 @@ +libopenmpi3t64: package-name-doesnt-match-sonames libopenmpi3 diff -pruN 5.0.5-5/debian/libopenmpi3t64.overrides 5.0.5-6/debian/libopenmpi3t64.overrides --- 5.0.5-5/debian/libopenmpi3t64.overrides 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi3t64.overrides 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1 @@ +libopenmpi3t64: package-name-doesnt-match-sonames libopenmpi3 diff -pruN 5.0.5-5/debian/libopenmpi40.install 5.0.5-6/debian/libopenmpi40.install --- 5.0.5-5/debian/libopenmpi40.install 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi40.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# Shared libraries -usr/lib/*/openmpi/lib/libprrte.so.3.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libmpi_mpifh*.so.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libmpi_usempif08*.so.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libmpi_usempi_ignore_tkr*.so.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libmpi.so.* /usr/lib/${DEB_HOST_MULTIARCH} -# usr/lib/*/openmpi/lib/libompitrace.so.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libopen-pal.so.* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/*/openmpi/lib/libprrte.so.* -## Plugins -usr/lib/*/openmpi/lib/openmpi40/*.so diff -pruN 5.0.5-5/debian/libopenmpi40.links 5.0.5-6/debian/libopenmpi40.links --- 5.0.5-5/debian/libopenmpi40.links 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi40.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# Compatibility links to /usr/bin -# SONAME symlinks -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40.40.5 usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40.40.2 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40.40.2 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40.40.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40 -# usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40.40.0 -usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.80.0.4 usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.80 -usr/lib/${DEB_HOST_MULTIARCH}/libprrte.so.3.0.6 usr/lib/${DEB_HOST_MULTIARCH}/libprrte.so.3 \ No newline at end of file diff -pruN 5.0.5-5/debian/libopenmpi40.overrides 5.0.5-6/debian/libopenmpi40.overrides --- 5.0.5-5/debian/libopenmpi40.overrides 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/libopenmpi40.overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -libopenmpi40: package-name-doesnt-match-sonames libopenmpi40 -libopenmpi40: package-name-doesnt-match-sonames libmpi-mpifh-gfortran40 libmpi-mpifh40 libmpi-usempi-ignore-tkr-gfortran40 libmpi-usempi-ignore-tkr40 libmpi-usempif08-40 libmpi-usempif08-gfortran40 libmpi40 libopen-pal80 libprrte3 diff -pruN 5.0.5-5/debian/not-installed 5.0.5-6/debian/not-installed --- 5.0.5-5/debian/not-installed 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/not-installed 2024-11-15 16:19:59.000000000 +0000 @@ -1,4 +1,4 @@ -/usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/openmpi40/*.la +/usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/openmpi3/*.la /usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/*.la # Installed, but dh_install doesn't handle the mv well usr/lib/${DEB_HOST_MULTIARCH}/openmpi/lib/libopen-pal.so.80 diff -pruN 5.0.5-5/debian/openmpi-bin.overrides 5.0.5-6/debian/openmpi-bin.overrides --- 5.0.5-5/debian/openmpi-bin.overrides 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/openmpi-bin.overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -openmpi-bin: uncompressed-manual-page \ No newline at end of file diff -pruN 5.0.5-5/debian/patches/libdir.patch 5.0.5-6/debian/patches/libdir.patch --- 5.0.5-5/debian/patches/libdir.patch 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/patches/libdir.patch 2024-11-15 16:19:59.000000000 +0000 @@ -1,8 +1,7 @@ Author: Alastair McKinstry -Description: Change install libdir to openmpi40 +Description: Change install libdir to openmpi3 This is needed to ensure that libopenmpi2, libopenmpi3 do not collide. - Now updated to openmpi40 for OpenMPI-5 -Last-Updated: 2024-10-31 +Last-Updated: 2019-03-09 Forwarded: no @@ -13,9 +12,9 @@ Forwarded: no # their own tarballs, with their own PACKAGE variables. opaldatadir='${datadir}/openmpi' -opallibdir='${libdir}/openmpi' -+opallibdir='${libdir}/openmpi40' ++opallibdir='${libdir}/openmpi3' opalincludedir='${includedir}/openmpi' -+pkglibdir='${libdir}/openmpi40' ++pkglibdir='${libdir}/openmpi3' AC_SUBST(opaldatadir) AC_SUBST(opallibdir) AC_SUBST(opalincludedir) diff -pruN 5.0.5-5/debian/patches/mpifort.patch 5.0.5-6/debian/patches/mpifort.patch --- 5.0.5-5/debian/patches/mpifort.patch 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/patches/mpifort.patch 2024-11-15 16:19:59.000000000 +0000 @@ -4,8 +4,6 @@ Author: Alastair McKinstry -Last-Updated: 2023-12-19 +Last-Updated: 2024-11-15 Forwarded: no ---- a/ompi/tools/wrappers/ompi-fort.pc.in -+++ b/ompi/tools/wrappers/ompi-fort.pc.in -@@ -12,8 +12,12 @@ +Index: openmpi-5.0.5/ompi/tools/wrappers/ompi-fort.pc.in +=================================================================== +--- openmpi-5.0.5.orig/ompi/tools/wrappers/ompi-fort.pc.in ++++ openmpi-5.0.5/ompi/tools/wrappers/ompi-fort.pc.in +@@ -12,8 +12,12 @@ includedir=@includedir@ libdir=@libdir@ pkgincludedir=@opalincludedir@ -Libs: @OMPI_PC_FC_LIBS@ -Libs.private: @OMPI_PC_FC_LIBS_PRIVATE@ +-Cflags: @OMPI_PC_FC_CFLAGS@ +# override $fortran with --define-variable when building on non-gfortran compile +fortran=gfortran +flibdir=${libdir}/../../fortran/${fortran} ++Libs: @OMPI_PC_FC_LIBS@ ++Libs.private: @OMPI_PC_FC_LIBS_PRIVATE@ + -+Libs: -L${flibdir} @OMPI_PC_FC_LIBS@ -+Libs.private: -L${flibdir} @OMPI_PC_FC_LIBS_PRIVATE@ - Cflags: @OMPI_PC_FC_CFLAGS@ ++Cflags: -I${libdir}/../../fortran/gfortran-mod-15/openmpi @OMPI_PC_FC_CFLAGS@ Requires: @OMPI_PC_MODULES@ Requires.private: @OMPI_PC_MODULES_PRIVATE@ ---- a/ompi/tools/wrappers/ompi.pc.in -+++ b/ompi/tools/wrappers/ompi.pc.in -@@ -14,6 +14,6 @@ +Index: openmpi-5.0.5/ompi/tools/wrappers/ompi.pc.in +=================================================================== +--- openmpi-5.0.5.orig/ompi/tools/wrappers/ompi.pc.in ++++ openmpi-5.0.5/ompi/tools/wrappers/ompi.pc.in +@@ -12,8 +12,8 @@ includedir=@includedir@ + libdir=@libdir@ + pkgincludedir=@opalincludedir@ - Libs: @OMPI_PC_LIBS@ - Libs.private: @OMPI_PC_LIBS_PRIVATE@ +-Libs: @OMPI_PC_LIBS@ +-Libs.private: @OMPI_PC_LIBS_PRIVATE@ -Cflags: @OMPI_PC_CFLAGS@ -+Cflags: -I@FMODDIR@/openmpi @OMPI_PC_CFLAGS@ ++Libs: @OMPI_PC_FC_LIBS@ ++Libs.private: @OMPI_PC_FC_LIBS_PRIVATE@ ++Cflags: -I${libdir}/../../fortran/gfortran-mod-15/openmpi @OMPI_PC_CFLAGS@ Requires: @OMPI_PC_MODULES@ Requires.private: @OMPI_PC_MODULES_PRIVATE@ diff -pruN 5.0.5-5/debian/rules 5.0.5-6/debian/rules --- 5.0.5-5/debian/rules 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/rules 2024-11-15 16:19:59.000000000 +0000 @@ -18,7 +18,7 @@ NO_VERBS_ARCH:= hurd-amd64 kfreebsd-amd6 NO_FABRIC_ARCH:=hurd-amd64 kfreebsd-amd64 s390x PSM_ARCH:= amd64 PSM2_ARCH:= amd64 -UCX_ARCH:= amd64 ppc64el arm64 riscv64 +UCX_ARCH:= amd64 ppc64el arm64 ATOMICS_ARCH:= s390x riscv64 NO_CMA_ARCH:= s390x alpha sparc64 NO_JAVA_ARCH:= hurd-amd64 kfreebsd-amd64 ppc64 alpha sparc64 @@ -155,7 +155,7 @@ override_dh_install: ln -s mpirun.openmpi $(DESTDIR)/usr/bin/mpiexec.openmpi ln -s mpirun.openmpi $(DESTDIR)/usr/bin/oshrun # Strip rpath from pc,wrapper files - for f in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi-fort.pc ompi.pc orte.pc opal.pc oshmem-c.pc oshmem-cxx.pc oshmem-fort.pc oshmem.pc ; do \ + for f in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi-fort.pc ompi.pc opal.pc oshmem-c.pc oshmem-cxx.pc oshmem-fort.pc oshmem.pc ; do \ sed -e 's/-Wl,-rpath -Wl,$${libdir}//' < $(DESTDIR)/$(LIBDIR)/openmpi/lib/pkgconfig/$${f} | \ sed -e 's%@FMODDIR@%${FMODDIR_STRING}%g' > debian/tmp.x ; \ mv debian/tmp.x $(DESTDIR)/$(LIBDIR)/openmpi/lib/pkgconfig/$${f} ; \ @@ -167,9 +167,11 @@ override_dh_install: # Rename the compiler wrapper man pages. for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 mpirun mpifort ; do \ if test -f $(DESTDIR)/usr/share/man/man1/$${f}.1; then \ + echo DEBUG7 $${f} ;\ mv $(DESTDIR)/usr/share/man/man1/$${f}.1 $(DESTDIR)/usr/share/man/man1/$${f}.openmpi.1 ; \ fi; \ if test -f $(DESTDIR)/usr/share/man/man1/$${f}.3; then \ + echo DEBUG8 $${f} ;\ mv $(DESTDIR)/usr/share/man/man3/$${f}.3 $(DESTDIR)/usr/share/man/man1/$${f}.openmpi.3 ; \ fi; \ done @@ -200,11 +202,11 @@ override_dh_install: cp $(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_mpifh.so.40.40.0 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40.40.0 ; \ cp $(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_usempi_ignore_tkr.so.40.40.0 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40.40.2 ; \ cp $(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_usempif08.so.40.40.2 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40.40.2 ; \ - dh_link -p libopenmpi40 $(LIBDIR)/libmpi_mpifh-flang.so.40.40.0 $(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \ + dh_link -p libopenmpi3 $(LIBDIR)/libmpi_mpifh-flang.so.40.40.0 $(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_mpifh-flang.so.40.40.0 $(FLANG_LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so ; \ - dh_link -p libopenmpi40 $(LIBDIR)/libmpi_usempif08-flang.so.40.40.2 $(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \ + dh_link -p libopenmpi3 $(LIBDIR)/libmpi_usempif08-flang.so.40.40.2 $(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_usempif08-flang.so.40.40.2 $(FLANG_LIBDIR)/openmpi/lib/libmpi_usempif08.so ; \ - dh_link -p libopenmpi40 $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.40.0 $(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \ + dh_link -p libopenmpi3 $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.40.0 $(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.40.0 $(FLANG_LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr.so ; \ ) || true # patchelf --set-soname libmpi_mpifh-flang.so.40 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40.40.0 ; \ @@ -236,7 +238,7 @@ override_dh_install: # Continue as usual dh_install # oshmem, shmem only built on Linux so do by hand or it may fail ... - # mkdir -p debian/libopenmpi40/$(LIBDIR)/openmpi/lib + # mkdir -p debian/libopenmpi3/$(LIBDIR)/openmpi/lib if test -f $(DESTDIR)/usr/bin/oshmem_info ; then \ dh_link -p openmpi-bin /usr/bin/mpirun.openmpi /usr/bin/oshrun ;\ dh_install -p openmpi-bin /usr/bin/oshmem_info ; \ @@ -252,8 +254,8 @@ override_dh_install: dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshCC.1 ; \ dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshc++.1 ; \ dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshcxx.1 ; \ - dh_install -p libopenmpi40 $(LIBDIR)/openmpi/lib/liboshmem.so.40.40.3 $(LIBDIR) ; \ - dh_link -p libopenmpi40 $(LIBDIR)/liboshmem.so.40.40.3 $(LIBDIR)/liboshmem.so.40 ; \ + dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/liboshmem.so.40.40.3 $(LIBDIR) ; \ + dh_link -p libopenmpi3 $(LIBDIR)/liboshmem.so.40.40.3 $(LIBDIR)/liboshmem.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/openmpi/lib/liboshmem.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/liboshmem.so ; \ fi @@ -261,8 +263,8 @@ override_dh_install: dh_install -p openmpi-bin /usr/bin/mpijavac ; \ dh_install -p openmpi-bin usr/bin/mpijavac.pl ; \ dh_installman openmpi-bin $(DESTDIR)/usr/share/man/man1/mpijavac.1 ; \ - dh_install -p libopenmpi40 $(LIBDIR)/openmpi/lib/libmpi_java.so.40.40.0 $(LIBDIR); \ - dh_link -p libopenmpi40 $(LIBDIR)/libmpi_java.so.40.40.0 $(LIBDIR)/libmpi_java.so.40 ; \ + dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmpi_java.so.40.40.0 $(LIBDIR); \ + dh_link -p libopenmpi3 $(LIBDIR)/libmpi_java.so.40.40.0 $(LIBDIR)/libmpi_java.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/openmpi/lib/libmpi_java.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/libmpi_java.so ; \ fi diff -pruN 5.0.5-5/debian/tests/compile-run-cc-pkgconf 5.0.5-6/debian/tests/compile-run-cc-pkgconf --- 5.0.5-5/debian/tests/compile-run-cc-pkgconf 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/tests/compile-run-cc-pkgconf 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -### Compile and run a simple MPI application, via pkgconf - -cd debian/tests - -cc -o hello hello.c `pkgconf mpi --libs --cflags` - -mpirun -n 1 ./hello diff -pruN 5.0.5-5/debian/tests/compile-run-cc-pkgconf-ompi 5.0.5-6/debian/tests/compile-run-cc-pkgconf-ompi --- 5.0.5-5/debian/tests/compile-run-cc-pkgconf-ompi 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/tests/compile-run-cc-pkgconf-ompi 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +### Compile and run a simple MPI application, via pkgconf + +cd debian/tests + +cc -o hello hello.c `pkgconf mpi --libs --cflags` + +mpirun -n 1 ./hello diff -pruN 5.0.5-5/debian/tests/compile-run-cc-pkgconf-ompi-c 5.0.5-6/debian/tests/compile-run-cc-pkgconf-ompi-c --- 5.0.5-5/debian/tests/compile-run-cc-pkgconf-ompi-c 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/tests/compile-run-cc-pkgconf-ompi-c 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +### Compile and run a simple MPI application, via pkgconf + +cd debian/tests + +cc -o hello hello.c `pkgconf ompi-c --libs --cflags` + +mpirun -n 1 ./hello diff -pruN 5.0.5-5/debian/tests/compile-run-f77-pkgconf-ompi-f77 5.0.5-6/debian/tests/compile-run-f77-pkgconf-ompi-f77 --- 5.0.5-5/debian/tests/compile-run-f77-pkgconf-ompi-f77 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/tests/compile-run-f77-pkgconf-ompi-f77 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +### Compile and run a simple MPI application, via pkgconf + +cd debian/tests + +f77 -o hello hello.f `pkgconf ompi-f77 --libs --cflags` + +mpirun -n 1 ./hello diff -pruN 5.0.5-5/debian/tests/compile-run-f90-pkgconf-ompi-fort 5.0.5-6/debian/tests/compile-run-f90-pkgconf-ompi-fort --- 5.0.5-5/debian/tests/compile-run-f90-pkgconf-ompi-fort 1970-01-01 00:00:00.000000000 +0000 +++ 5.0.5-6/debian/tests/compile-run-f90-pkgconf-ompi-fort 2024-11-15 16:19:59.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +### Compile and run a simple MPI application, via pkgconf + +cd debian/tests + +gfortran -o hello hello.f90 `pkgconf ompi-fort --libs --cflags` + +mpirun -n 1 ./hello diff -pruN 5.0.5-5/debian/tests/control 5.0.5-6/debian/tests/control --- 5.0.5-5/debian/tests/control 2024-11-09 06:29:12.000000000 +0000 +++ 5.0.5-6/debian/tests/control 2024-11-15 16:19:59.000000000 +0000 @@ -7,14 +7,23 @@ Depends: gfortran, libopenmpi-dev, openm Tests: compile-run-mpif77 Depends: gfortran, libopenmpi-dev, openmpi-bin -Tests: compile-run-cc-pkgconf +Tests: compile-run-cc-pkgconf-ompi-c Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf -Tests: compile-run-f90-pkgconf +Tests: compile-run-cc-pkgconf-ompi +Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf + +Tests: compile-run-f90-pkgconf +Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf + +Tests: compile-run-f90-pkgconf-ompi-fort Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf Tests: compile-run-f77-pkgconf Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf +Tests: compile-run-f77-pkgconf-ompi-f77 +Depends: gfortran, libopenmpi-dev, openmpi-bin, pkgconf + Tests: check-shared-objs Depends: openmpi-bin