Package: openmpi
Followup-For: Bug #1066834
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
This patch should install the optional libraries to the transitioned binary
packages.
* d/rules: correctly install all the optional libraries to the t64-suffixed
binary packages. (LP: #1070321)
Thanks for considering the patch.
diff -Nru openmpi-4.1.6/debian/rules openmpi-4.1.6/debian/rules
--- openmpi-4.1.6/debian/rules 2024-03-12 20:30:35.000000000 -0600
+++ openmpi-4.1.6/debian/rules 2024-03-13 18:49:15.000000000 -0600
@@ -179,11 +179,11 @@
cp
$(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_mpifh.so.40.30.0
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40.30.0 ; \
cp
$(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_usempi_ignore_tkr.so.40.30.0
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40.30.0 ; \
cp
$(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_usempif08.so.40.30.0
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40.30.0 ; \
- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_mpifh-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmpi_mpifh-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmpi_mpifh-flang.so.40.30.0
$(FLANG_LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmpi_usempif08-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmpi_usempif08-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmpi_usempif08-flang.so.40.30.0
$(FLANG_LIBDIR)/openmpi/lib/libmpi_usempif08.so ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.0
$(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.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.30.0 ; \
@@ -231,8 +231,8 @@
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 libopenmpi3
$(LIBDIR)/openmpi/lib/liboshmem.so.40.30.3 $(LIBDIR) ; \
- dh_link -p libopenmpi3 $(LIBDIR)/liboshmem.so.40.30.3
$(LIBDIR)/liboshmem.so.40 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/liboshmem.so.40.30.3 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64 $(LIBDIR)/liboshmem.so.40.30.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
@@ -240,45 +240,45 @@
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 libopenmpi3
$(LIBDIR)/openmpi/lib/libmpi_java.so.40.30.0 $(LIBDIR); \
- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_java.so.40.30.0
$(LIBDIR)/libmpi_java.so.40 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmpi_java.so.40.30.0 $(LIBDIR); \
+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmpi_java.so.40.30.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
if test -f
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 ; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 $(LIBDIR); \
- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ucx.so.40.30.2
$(LIBDIR)/libmca_common_ucx.so.40 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 $(LIBDIR); \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_ucx.so.40.30.2 $(LIBDIR)/libmca_common_ucx.so.40 ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40
$(LIBDIR)/openmpi/lib/libmca_common_ucx.so ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40
$(LIBDIR)/libmca_common_ucx.so ; \
fi
if test -f
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 ; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 $(LIBDIR) ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmca_common_monitoring.so.50.20.0
$(LIBDIR)/libmca_common_monitoring.so.50 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_monitoring.so.50.20.0
$(LIBDIR)/libmca_common_monitoring.so.50 ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmca_common_monitoring.so.50
$(LIBDIR)/openmpi/lib/libmca_common_monitoring.so ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmca_common_monitoring.so.50
$(LIBDIR)/libmca_common_monitoring.so ; \
fi
# No longer needed ?
if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2
; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2 $(LIBDIR) ; \
- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ofi.so.10.0.2
$(LIBDIR)/libmca_common_ofi.so.10 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_ofi.so.10.0.2 $(LIBDIR)/libmca_common_ofi.so.10 ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10
$(LIBDIR)/openmpi/lib/libmca_common_ofi.so ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10
$(LIBDIR)/libmca_common_ofi.so ; \
fi
if test -f
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4 $(LIBDIR) ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmca_common_ompio.so.41.29.4 $(LIBDIR)/libmca_common_ompio.so.41 ;
\
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_ompio.so.41.29.4 $(LIBDIR)/libmca_common_ompio.so.41 ;
\
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41
$(LIBDIR)/openmpi/lib/libmca_common_ompio.so ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41
$(LIBDIR)/libmca_common_ompio.so ; \
fi
if test -f
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 ; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 $(LIBDIR) ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmca_common_verbs.so.40.30.0 $(LIBDIR)/libmca_common_verbs.so.40 ;
\
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_verbs.so.40.30.0 $(LIBDIR)/libmca_common_verbs.so.40 ;
\
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_verbs.so.40
$(LIBDIR)/openmpi/lib/libmca_common_verbs.so ; \
dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_verbs.so.40
$(LIBDIR)/libmca_common_verbs.so ; \
fi
if test -f
$(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 ; then \
- dh_install -p libopenmpi3
$(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 $(LIBDIR) ; \
- dh_link -p libopenmpi3
$(LIBDIR)/libmca_common_libfabric.so.40.30.0
$(LIBDIR)/libmca_common_libfabric.so.40 ; \
+ dh_install -p libopenmpi3t64
$(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 $(LIBDIR) ; \
+ dh_link -p libopenmpi3t64
$(LIBDIR)/libmca_common_libfabric.so.40.30.0
$(LIBDIR)/libmca_common_libfabric.so.40 ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmca_common_libfabric.so.40
$(LIBDIR)/openmpi/lib/libmca_common_libfabric.so ; \
dh_link -p libopenmpi-dev
$(LIBDIR)/libmca_common_libfabric.so.40 $(LIBDIR)/libmca_common_libfabric.so ;
\
fi
