Ubuntu
openmpi package

Merge ~liushuyu-011/ubuntu/+source/openmpi:ubuntu/devel into ubuntu/+source/openmpi:ubuntu/devel

  1. Git
  2. lp:~liushuyu-011/ubuntu/+source/openmpi
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Zixing Liu
Status: Merged
Merged at revision: 3c47e5aee1ea8dc368991975766470cd88a81d1c
Proposed branch: ~liushuyu-011/ubuntu/+source/openmpi:ubuntu/devel
Merge into: ubuntu/+source/openmpi:ubuntu/devel
Diff against target: 105 lines (+26/-19)
2 files modified
debian/changelog (+7/-0)
debian/rules (+19/-19)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+462375@code.launchpad.net

Description of the change

This MP fixes an issue where many MPI libraries are missing in the libopenmpi3t64 binary package.

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15856200/+listing-archive-extra

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index b378878..c59d2fc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+openmpi (4.1.6-5.1ubuntu4) noble; urgency=medium
7+
8+ * d/rules: correctly install all the optional libraries to the t64-suffixed
9+ binary packages. (LP: #1070321)
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Wed, 13 Mar 2024 18:49:40 -0600
12+
13 openmpi (4.1.6-5.1ubuntu3) noble; urgency=medium
14
15 * Remove redundant libpmix2 dependency
16diff --git a/debian/rules b/debian/rules
17index b06ec71..bf1205f 100755
18--- a/debian/rules
19+++ b/debian/rules
20@@ -179,11 +179,11 @@ override_dh_install:
21 cp $(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_mpifh.so.40.30.0 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40.30.0 ; \
22 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 ; \
23 cp $(BUILDDIR_FLANG)/ompi/mpi/fortran/*/.libs/libmpi_usempif08.so.40.30.0 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40.30.0 ; \
24- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_mpifh-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \
25+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmpi_mpifh-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40 ; \
26 dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_mpifh-flang.so.40.30.0 $(FLANG_LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so ; \
27- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_usempif08-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \
28+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmpi_usempif08-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_usempif08-flang.so.40 ; \
29 dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_usempif08-flang.so.40.30.0 $(FLANG_LIBDIR)/openmpi/lib/libmpi_usempif08.so ; \
30- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \
31+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.0 $(LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr-flang.so.40 ; \
32 dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_usempi_ignore_tkr-flang.so.40.30.0 $(FLANG_LIBDIR)/openmpi/lib/libmpi_usempi_ignore_tkr.so ; \
33 ) || true
34 # patchelf --set-soname libmpi_mpifh-flang.so.40 $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmpi_mpifh-flang.so.40.30.0 ; \
35@@ -231,8 +231,8 @@ override_dh_install:
36 dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshCC.1 ; \
37 dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshc++.1 ; \
38 dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshcxx.1 ; \
39- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/liboshmem.so.40.30.3 $(LIBDIR) ; \
40- dh_link -p libopenmpi3 $(LIBDIR)/liboshmem.so.40.30.3 $(LIBDIR)/liboshmem.so.40 ; \
41+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/liboshmem.so.40.30.3 $(LIBDIR) ; \
42+ dh_link -p libopenmpi3t64 $(LIBDIR)/liboshmem.so.40.30.3 $(LIBDIR)/liboshmem.so.40 ; \
43 dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/openmpi/lib/liboshmem.so ; \
44 dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/liboshmem.so ; \
45 fi
46@@ -240,45 +240,45 @@ override_dh_install:
47 dh_install -p openmpi-bin /usr/bin/mpijavac ; \
48 dh_install -p openmpi-bin usr/bin/mpijavac.pl ; \
49 dh_installman openmpi-bin $(DESTDIR)/usr/share/man/man1/mpijavac.1 ; \
50- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmpi_java.so.40.30.0 $(LIBDIR); \
51- dh_link -p libopenmpi3 $(LIBDIR)/libmpi_java.so.40.30.0 $(LIBDIR)/libmpi_java.so.40 ; \
52+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmpi_java.so.40.30.0 $(LIBDIR); \
53+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmpi_java.so.40.30.0 $(LIBDIR)/libmpi_java.so.40 ; \
54 dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/openmpi/lib/libmpi_java.so ; \
55 dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/libmpi_java.so ; \
56 fi
57 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 ; then \
58- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 $(LIBDIR); \
59- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ucx.so.40.30.2 $(LIBDIR)/libmca_common_ucx.so.40 ; \
60+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 $(LIBDIR); \
61+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_ucx.so.40.30.2 $(LIBDIR)/libmca_common_ucx.so.40 ; \
62 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so ; \
63 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40 $(LIBDIR)/libmca_common_ucx.so ; \
64 fi
65 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 ; then \
66- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 $(LIBDIR) ; \
67- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_monitoring.so.50.20.0 $(LIBDIR)/libmca_common_monitoring.so.50 ; \
68+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_monitoring.so.50.20.0 $(LIBDIR) ; \
69+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_monitoring.so.50.20.0 $(LIBDIR)/libmca_common_monitoring.so.50 ; \
70 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_monitoring.so.50 $(LIBDIR)/openmpi/lib/libmca_common_monitoring.so ; \
71 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_monitoring.so.50 $(LIBDIR)/libmca_common_monitoring.so ; \
72 fi
73 # No longer needed ?
74 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2 ; then \
75- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2 $(LIBDIR) ; \
76- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ofi.so.10.0.2 $(LIBDIR)/libmca_common_ofi.so.10 ; \
77+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_ofi.so.10.0.2 $(LIBDIR) ; \
78+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_ofi.so.10.0.2 $(LIBDIR)/libmca_common_ofi.so.10 ; \
79 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10 $(LIBDIR)/openmpi/lib/libmca_common_ofi.so ; \
80 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10 $(LIBDIR)/libmca_common_ofi.so ; \
81 fi
82 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4; then \
83- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4 $(LIBDIR) ; \
84- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ompio.so.41.29.4 $(LIBDIR)/libmca_common_ompio.so.41 ; \
85+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4 $(LIBDIR) ; \
86+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_ompio.so.41.29.4 $(LIBDIR)/libmca_common_ompio.so.41 ; \
87 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so ; \
88 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41 $(LIBDIR)/libmca_common_ompio.so ; \
89 fi
90 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 ; then \
91- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 $(LIBDIR) ; \
92- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_verbs.so.40.30.0 $(LIBDIR)/libmca_common_verbs.so.40 ; \
93+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_verbs.so.40.30.0 $(LIBDIR) ; \
94+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_verbs.so.40.30.0 $(LIBDIR)/libmca_common_verbs.so.40 ; \
95 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_verbs.so.40 $(LIBDIR)/openmpi/lib/libmca_common_verbs.so ; \
96 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_verbs.so.40 $(LIBDIR)/libmca_common_verbs.so ; \
97 fi
98 if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 ; then \
99- dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 $(LIBDIR) ; \
100- dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_libfabric.so.40.30.0 $(LIBDIR)/libmca_common_libfabric.so.40 ; \
101+ dh_install -p libopenmpi3t64 $(LIBDIR)/openmpi/lib/libmca_common_libfabric.so.40.30.0 $(LIBDIR) ; \
102+ dh_link -p libopenmpi3t64 $(LIBDIR)/libmca_common_libfabric.so.40.30.0 $(LIBDIR)/libmca_common_libfabric.so.40 ; \
103 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_libfabric.so.40 $(LIBDIR)/openmpi/lib/libmca_common_libfabric.so ; \
104 dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_libfabric.so.40 $(LIBDIR)/libmca_common_libfabric.so ; \
105 fi

Subscribers

People subscribed via source and target branches