[pmix] 01/16: Split packages for libpmi, libpmi2 out
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Jan 4 14:23:52 UTC 2018
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository pmix.
commit 1753d8dff2988f29a9bda40d13f26a27b5b05f06
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Nov 22 16:12:02 2017 +0000
Split packages for libpmi, libpmi2 out
---
debian/control | 41 ++++++++++++++++------
debian/libpmi-pmix-dev.install.in | 4 +++
debian/libpmi-pmix-dev.links.in | 2 ++
debian/libpmi-pmix.install | 1 +
debian/libpmi-pmix.links.in | 1 +
debian/libpmi2-pmix.install | 1 +
.../{libpmix2.links.in => libpmi2-pmix.links.in} | 1 -
debian/libpmix-dev.install.in | 4 +--
debian/libpmix-dev.links.in | 3 +-
debian/libpmix2.install | 1 -
debian/libpmix2.links.in | 1 -
debian/rules | 4 ++-
12 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index 55e0f46..4fd45f6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,16 +16,37 @@ Package: libpmix-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpmix2 (= ${binary:Version}),
-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
- MPI library available. A completely new MPI-3 compliant implementation, Open
- MPI offers advantages for system and software vendors, application developers
- and computer science researchers.
- .
- This package contains the header files and compiler wrappers which are needed
- to compile and link programs against libopenmpi.
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpmix2-pmix (= ${binary:Version}),
+Description: Development files for the PMI Exascale library
+ This is the OpenMPI implementation of the Process Management Interface (PMI)
+ Exascale API. PMIx aims to retain transparent compatibility with the existing
+ PMI-1 and PMI-2 definitions, and any future PMI releases; Support
+ the Instant On initiative for rapid startup of applications at exascale
+ and beyond.
+
+Package: libpmi-pmix-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpmix2-pmix (= ${binary:Version}),
+Description: Development files for the PMI library (OpenMPI )
+ This is the OpenMPI implementation of the Process Management Interface (PMI)
+
+Package: libpmi-pmix
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc-plugins
+Description: OpenMPI implementation of the PMI v1 library
+ This contains the OpenMPI Implementation
+
+Package: libpmi2-pmix
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc-plugins
+Description: OpenMPI implementation of the PMI v2 library
+ This contains the OpenMPI Implementation
Package: libpmix2
Section: libs
diff --git a/debian/libpmi-pmix-dev.install.in b/debian/libpmi-pmix-dev.install.in
new file mode 100644
index 0000000..58a83e5
--- /dev/null
+++ b/debian/libpmi-pmix-dev.install.in
@@ -0,0 +1,4 @@
+/usr/include/pmi.h /usr/include/@TRIPLET@/openmpi/include
+/usr/include/pmi2.h /usr/include/@TRIPLET@/openmpi/include
+./debian/static-build/src/.libs/libpmi.a /usr/lib/@TRIPLET@/openmpi/lib
+./debian/static-build/src/.libs/libpmi2.a /usr/lib/@TRIPLET@/openmpi/lib
diff --git a/debian/libpmi-pmix-dev.links.in b/debian/libpmi-pmix-dev.links.in
new file mode 100644
index 0000000..be56edf
--- /dev/null
+++ b/debian/libpmi-pmix-dev.links.in
@@ -0,0 +1,2 @@
+/usr/lib/@TRIPLET@/libpmi2.so.1.0.0 /usr/lib/@TRIPLET@/openmpi/lib/libpmi2.so
+/usr/lib/@TRIPLET@/libpmi.so.1.0.0 /usr/lib/@TRIPLET@/openmpi/lib/libpmi.so
diff --git a/debian/libpmi-pmix.install b/debian/libpmi-pmix.install
new file mode 100644
index 0000000..9eac4dd
--- /dev/null
+++ b/debian/libpmi-pmix.install
@@ -0,0 +1 @@
+usr/lib/*/libpmi.so.1.0.0
diff --git a/debian/libpmi-pmix.links.in b/debian/libpmi-pmix.links.in
new file mode 100644
index 0000000..a101d03
--- /dev/null
+++ b/debian/libpmi-pmix.links.in
@@ -0,0 +1 @@
+/usr/lib/@TRIPLET@/libpmi.so.1.0.0 /usr/lib/@TRIPLET@/libpmi.so.1
diff --git a/debian/libpmi2-pmix.install b/debian/libpmi2-pmix.install
new file mode 100644
index 0000000..afbe6c9
--- /dev/null
+++ b/debian/libpmi2-pmix.install
@@ -0,0 +1 @@
+usr/lib/*/libpmi2.so.1.0.0
diff --git a/debian/libpmix2.links.in b/debian/libpmi2-pmix.links.in
similarity index 50%
copy from debian/libpmix2.links.in
copy to debian/libpmi2-pmix.links.in
index 98e2455..70de388 100644
--- a/debian/libpmix2.links.in
+++ b/debian/libpmi2-pmix.links.in
@@ -1,2 +1 @@
-/usr/lib/@TRIPLET@/libpmix.so.2.1.3 /usr/lib/@TRIPLET@/libpmix.so.2
/usr/lib/@TRIPLET@/libpmi2.so.1.0.0 /usr/lib/@TRIPLET@/libpmi2.so.1
diff --git a/debian/libpmix-dev.install.in b/debian/libpmix-dev.install.in
index 43dfff6..1fc8026 100644
--- a/debian/libpmix-dev.install.in
+++ b/debian/libpmix-dev.install.in
@@ -1,3 +1,3 @@
-/usr/include
+/usr/include/pmix*
/usr/share/man/*
-./debian/static-build/src/.libs/libpmix.a /usr/lib/@TRIPLET@
+./debian/static-build/src/.libs/libpmix.a /usr/lib/@TRIPLET@/openmpi/lib
diff --git a/debian/libpmix-dev.links.in b/debian/libpmix-dev.links.in
index ec083fa..e900a6b 100644
--- a/debian/libpmix-dev.links.in
+++ b/debian/libpmix-dev.links.in
@@ -1,2 +1 @@
-/usr/lib/@TRIPLET@/libpmix.so.2.1.3 /usr/lib/@TRIPLET@/libpmix.so
-/usr/lib/@TRIPLET@/libpmi2.so.1.0.0 /usr/lib/@TRIPLET@/libpmi2.so
+/usr/lib/@TRIPLET@/libpmix.so.2.1.3 /usr/lib/@TRIPLET@/openmpi/lib/libpmix.so
diff --git a/debian/libpmix2.install b/debian/libpmix2.install
index c3e5317..f91ae49 100644
--- a/debian/libpmix2.install
+++ b/debian/libpmix2.install
@@ -1,4 +1,3 @@
-usr/lib/*/libpmix.so.2.1.3
usr/lib/*/libpmi2.so.1.0.0
usr/lib/*/pmix
usr/share/pmix
diff --git a/debian/libpmix2.links.in b/debian/libpmix2.links.in
index 98e2455..c8d7f4d 100644
--- a/debian/libpmix2.links.in
+++ b/debian/libpmix2.links.in
@@ -1,2 +1 @@
/usr/lib/@TRIPLET@/libpmix.so.2.1.3 /usr/lib/@TRIPLET@/libpmix.so.2
-/usr/lib/@TRIPLET@/libpmi2.so.1.0.0 /usr/lib/@TRIPLET@/libpmi2.so.1
diff --git a/debian/rules b/debian/rules
index ff489b3..9dd522b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,9 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-AUTOGENERATED:= libpmix2.links libpmix-dev.links libpmix-dev.install
+AUTOGENERATED:= libpmix2.links libpmix-dev.links libpmix-dev.install \
+ libpmi-pmix.links libpmi2-pmix.links libpmi-pmix-dev.links \
+ libpmi-pmix-dev.install
PSM_ARCH:= amd64 i386
ifneq (,$(findstring $(DEB_HOST_ARCH),$(PSM_ARCH)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pmix.git
More information about the debian-science-commits
mailing list