Soften version check

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-12-08 19:09:01 -05:00
parent f9b43d3d69
commit c027d11b82
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git mpich-3.2/./src/binding/cxx/mpicxx.h.in~ mpich-3.2/./src/binding/cxx/mpicxx.h.in
index 375c081e0e..24f1d6c2cc 100644
--- mpich-3.2/./src/binding/cxx/mpicxx.h.in~
+++ mpich-3.2/./src/binding/cxx/mpicxx.h.in
@@ -17,7 +17,7 @@
// between 3.2.3 and 3.4.3 (!!) Normally such changes
// should only occur at major releases (e.g., version 3 to 4)
#ifdef __GNUC__
-# if __GNUC__ >= @GNUCXX_VERSION@
+# if __GNUC__ >= @GNUCXX_VERSION@ && @GNUCXX_VERSION@ == 3
# if __GNUC_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2
# error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
# endif

View File

@ -1,7 +1,7 @@
Summary: A high-performance implementation of MPI
Name: mpich
Version: 3.2
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
Group: Development/Libraries
URL: http://www.mpich.org/
@ -13,6 +13,7 @@ Source3: mpich.pth.py3
Patch0: mpich-modules.patch
Patch1: https://trac.mpich.org/projects/mpich/raw-attachment/ticket/2299/0001-pm-remshell-include-MPL-when-linking.patch
Patch2: 0002-pm-gforker-include-MPL-when-linking.patch
Patch3: 0003-soften-version-check.patch
BuildRequires: gcc-gfortran
BuildRequires: hwloc-devel >= 1.8
@ -240,6 +241,9 @@ make check VERBOSE=1
%{_datadir}/%{name}/doc/
%changelog
* Wed Dec 9 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2-2
- Soften version check (#1289779)
* Tue Dec 1 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2-1
- Update to latest version