1
1

Merge pull request from rhc54/cmr41/pmix322

v4.1.x: Update PMIx to v3.2.2
Этот коммит содержится в:
Jeff Squyres 2020-12-08 10:03:36 -05:00 коммит произвёл GitHub
родитель 91b81d9966 da9ebdac42
Коммит cf1705298c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 58 добавлений и 13 удалений
opal/mca/pmix/pmix3x/pmix

Просмотреть файл

@ -26,6 +26,10 @@ Master (not on release branches yet)
3.2.2 -- TBD
----------------------
- PR #1930: Remove man page setup as there are no manpages in v3.2
- PR #1933: Remove stale config command
- PR #1940: Fix dependency issue with hwloc
- PR #1941: .spec: add *-devel packages
3.2.1 -- 12 Nov 2020

Просмотреть файл

@ -16,7 +16,7 @@
major=3
minor=2
release=1
release=2
# greek is used for alpha or beta release tags. If it is non-empty,
# it will be appended to the version number. It does not have to be
@ -31,7 +31,7 @@ greek=
# command, or with the date (if "git describe" fails) in the form of
# "date<date>".
repo_rev=gitd3d610b
repo_rev=git1703e6fb
# If tarball_version is not empty, it is used as the version string in
# the tarball filename, regardless of all other versions listed in
@ -45,7 +45,7 @@ tarball_version=
# The date when this release was created
date="Nov 12, 2020"
date="Dec 01, 2020"
# The shared library version of each of PMIx's public libraries.
# These versions are maintained in accordance with the "Library
@ -76,7 +76,7 @@ date="Nov 12, 2020"
# Version numbers are described in the Libtool current:revision:age
# format.
libpmix_so_version=4:31:2
libpmix_so_version=4:32:2
libpmi_so_version=1:1:0
libpmi2_so_version=1:0:0

Просмотреть файл

@ -266,9 +266,9 @@ AC_MSG_RESULT([$LIBS])
# Dependencies that themselves have a pkg-config file available.
#
PC_REQUIRES=""
AS_IF([test "$pmix_hwloc_support_will_build" = "yes"],
AS_IF([test "$pmix_hwloc_support_will_build" = "yes" && test "$pmix_hwloc_source" != "embedded"],
[PC_REQUIRES="$PC_REQUIRES hwloc"])
AS_IF([test $pmix_libevent_support -eq 1],
AS_IF([test $pmix_libevent_support -eq 1 && test "$pmix_libevent_source" != "embedded"],
[PC_REQUIRES="$PC_REQUIRES libevent"])
AS_IF([test "$pmix_zlib_support" = "1"],
[PC_REQUIRES="$PC_REQUIRES zlib"])

Просмотреть файл

@ -12,7 +12,7 @@
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Mellanox Technologies, Inc.
# All rights reserved.
# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
@ -192,7 +192,7 @@
Summary: An extended/exascale implementation of PMI
Name: %{?_name:%{_name}}%{!?_name:pmix}
Version: 3.2.1
Version: 3.2.2
Release: 1%{?dist}
License: BSD
Group: Development/Libraries
@ -229,10 +229,20 @@ APIs to eliminate some current restrictions that impact scalability, and (b) pro
a reference implementation of the PMI-server that demonstrates the desired level of
scalability.
%if %{build_all_in_one_rpm}
This RPM contains all the tools necessary to compile and link against PMIx.
%endif
# if build_all_in_one_rpm = 0, build split packages
%if !%{build_all_in_one_rpm}
%package devel
Summary: PMIx developpement packages
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This RPM contains headers and shared objects symbolic links necessary to compile
and link against PMIx.
%package libpmi
Summary: PMI-1 and PMI-2 compatibility libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -245,6 +255,16 @@ into its PMIx equivalent. This is especially targeted at apps/libs that are
hardcoded to dlopen “libpmi” or “libpmi2”.
This package conflicts sith slurm-libpmi, which provides its own, incompatible
versions of libpmi.so and libpmi2.so.
%package libpmi-devel
Summary: PMI-1 and PMI-2 compatibility developpement libraryes
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}%{?_isa}-devel = %{version}-%{release}
Conflicts: slurm-libpmi
%description libpmi-devel
The %{name}-libpmi-devel package contains headers and shared objects
symbolic links of libpmi and libpmi2 libraries.
%endif
#############################################################################
@ -513,17 +533,35 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
# if building separate RPMs, split the compatibility libs
%if !%{build_all_in_one_rpm}
%exclude %{_includedir}
%exclude %{_libdir}/*.so
%exclude %{_libdir}/*.la
%exclude %{_libdir}/libpmi.*
%exclude %{_libdir}/libpmi2.*
%files devel
%{_includedir}
%{_libdir}/*.so
%{_libdir}/*.la
%exclude %{_libdir}/libpmi.*
%exclude %{_libdir}/libpmi2.*
%exclude %{_includedir}/pmi.*
%exclude %{_includedir}/pmi2.*
%files libpmi
%{_libdir}/libpmi.*
%{_libdir}/libpmi2.*
%{_includedir}/pmi.*
%{_includedir}/pmi2.*
%endif
%{_libdir}/libpmi.so.*
%{_libdir}/libpmi2.so.*
%files libpmi-devel
%{_libdir}/libpmi.so
%{_libdir}/libpmi2.so
%{_includedir}/pmi.h
%{_includedir}/pmi2.h
%endif # build_all_in_one_rpm
#############################################################################
#
@ -531,6 +569,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
#
#############################################################################
%changelog
* Mon Sep 21 2020 Piotr Lesnicki <piotr.lesnicki@atos.net>
- Enable separate -devel rpms
* Tue Apr 30 2019 Kilian Cavalotti <kilian@stanford.edu>
- Enable multiple RPMs build to allow backward compatibility PMI-1 and PMI-2
libs to be built separate. "rpmbuild --define 'build_all_in_one_rpm 0' ..."