From 4c04b16a25a4b8e879d8fad4cf6681fd7b3e57bc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jan 2020 14:06:10 -0500
Subject: [PATCH] import mvapich2-2.3.2-2.el8
---
.gitignore | 2 +-
.mvapich2.metadata | 2 +-
...001-mvapich23-unbundle-contrib-hwloc.patch | 20 +++++++++----------
...02-mvapich23-unbundle-osu_benchmarks.patch | 14 ++++++-------
SPECS/mvapich2.spec | 16 +++++++++++----
5 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
index 253fc55..d422a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mvapich2-2.3.tar.gz
+SOURCES/mvapich2-2.3.2.tar.gz
diff --git a/.mvapich2.metadata b/.mvapich2.metadata
index d1c6779..805da52 100644
--- a/.mvapich2.metadata
+++ b/.mvapich2.metadata
@@ -1 +1 @@
-03a4703431dd354a31edef97d018e3bf137c41e9 SOURCES/mvapich2-2.3.tar.gz
+19b051db6e4140afa9bc608274ba1f87a4116a34 SOURCES/mvapich2-2.3.2.tar.gz
diff --git a/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch b/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch
index 7e565f5..374d0fd 100644
--- a/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch
+++ b/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch
@@ -12,17 +12,17 @@ index 0d9ec512f5..ff3af667a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3029,10 +3029,10 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
- @BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_173 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
- @BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_174 = $(mpi_fc_sources)
- @BUILD_CXX_BINDING_TRUE@am__append_175 = lib/lib@MPICXXLIBNAME@.la
--@BUILD_OSU_MVAPICH_TRUE@am__append_176 = contrib/hwloc
-+@BUILD_OSU_MVAPICH_TRUE@am__append_176 =
- @BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
--@BUILD_OSU_MVAPICH_TRUE@am__append_178 = -Icontrib/hwloc/include/ -I$(top_srcdir)/contrib/hwloc/include
--@BUILD_OSU_MVAPICH_TRUE@am__append_179 = contrib/hwloc/src/libhwloc_embedded.la
+ @BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_175 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
+ @BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_176 = $(mpi_fc_sources)
+ @BUILD_CXX_BINDING_TRUE@am__append_177 = lib/lib@MPICXXLIBNAME@.la
+-@BUILD_OSU_MVAPICH_TRUE@am__append_178 = contrib/hwloc
+@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
-+@BUILD_OSU_MVAPICH_TRUE@am__append_179 = -lhwloc
- @BUILD_COVERAGE_TRUE@am__append_180 = coverage-clean
+ @BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
+-@BUILD_OSU_MVAPICH_TRUE@am__append_180 = -Icontrib/hwloc/include/ -I$(top_srcdir)/contrib/hwloc/include
+-@BUILD_OSU_MVAPICH_TRUE@am__append_181 = contrib/hwloc/src/libhwloc_embedded.la
++@BUILD_OSU_MVAPICH_TRUE@am__append_180 =
++@BUILD_OSU_MVAPICH_TRUE@am__append_181 = -lhwloc
+ @BUILD_COVERAGE_TRUE@am__append_182 = coverage-clean
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--
diff --git a/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch b/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch
index e965817..8c63b4b 100644
--- a/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch
+++ b/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch
@@ -12,14 +12,14 @@ index ff3af667a4..21e2754b56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3030,7 +3030,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
- @BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_174 = $(mpi_fc_sources)
- @BUILD_CXX_BINDING_TRUE@am__append_175 = lib/lib@MPICXXLIBNAME@.la
- @BUILD_OSU_MVAPICH_TRUE@am__append_176 =
--@BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
-+@BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild
+ @BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_176 = $(mpi_fc_sources)
+ @BUILD_CXX_BINDING_TRUE@am__append_177 = lib/lib@MPICXXLIBNAME@.la
@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
- @BUILD_OSU_MVAPICH_TRUE@am__append_179 = -lhwloc
- @BUILD_COVERAGE_TRUE@am__append_180 = coverage-clean
+-@BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
++@BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild
+ @BUILD_OSU_MVAPICH_TRUE@am__append_180 =
+ @BUILD_OSU_MVAPICH_TRUE@am__append_181 = -lhwloc
+ @BUILD_COVERAGE_TRUE@am__append_182 = coverage-clean
--
2.13.6
diff --git a/SPECS/mvapich2.spec b/SPECS/mvapich2.spec
index 108b9d0..cd7ad03 100644
--- a/SPECS/mvapich2.spec
+++ b/SPECS/mvapich2.spec
@@ -29,8 +29,8 @@
%endif
Name: mvapich2
-Version: 2.3
-Release: 5%{?dist}
+Version: 2.3.2
+Release: 2%{?dist}
Summary: OSU MVAPICH2 MPI package
Group: Development/Libraries
# Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114:
@@ -56,10 +56,10 @@ Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch
BuildRequires: gcc-gfortran
BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel
-BuildRequires: python3-devel, perl-Digest-MD5, hwloc-devel, libibmad-devel
+BuildRequires: python3-devel, perl-Digest-MD5, hwloc-devel, rdma-core-devel
BuildRequires: bison, flex
BuildRequires: autoconf, automake, libtool
-BuildRequires: rpm-mpi-hooks
+BuildRequires: rpm-mpi-hooks, rdma-core-devel, infiniband-diags-devel
%ifarch x86_64
BuildRequires: libpsm2-devel >= 10.3.58
%endif
@@ -390,6 +390,14 @@ cd ..
%changelog
+* Tue Nov 19 2019 Jarod Wilson <jarod@redhat.com> 2.3.2-2
+- Add BR: rdma-core-devel and infiniband-diags-devel for infiniband/mad.h
+- Related: rhbz#1708656
+
+* Tue Nov 19 2019 Jarod Wilson <jarod@redhat.com> 2.3.2-1
+- Update to upstream stable point release v2.3.2
+- Resolves: rhbz#1708656
+
* Thu Nov 08 2018 Jarod Wilson <jarod@redhat.com> 2.3-5
- Add missing Provides: mpi and Requires: environment-modules to base mvapich2 package
- Resolves: rhbz#1647177