[mpich] 08/20: Remove gcc compiler check. Closes: #855324

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository mpich.

commit db11aea3e1f633ef648e6642b553d41d99b95463
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Aug 10 09:30:11 2017 +0100

    Remove gcc compiler check. Closes: #855324
---
 debian/changelog                  |  7 +++++++
 debian/patches/10_gcc-check.patch | 39 ++++++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9510dff..a371190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mpich (3.3~a2-2) UNRELEASED; urgency=medium
+
+  [ Alastair McKinstry ]
+  * Remove gcc compiler check. Closes: #855324
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 10 Aug 2017 09:29:30 +0100
+
 mpich (3.3~a2-1) experimental; urgency=medium
 
   [ Alastair McKinstry ]
diff --git a/debian/patches/10_gcc-check.patch b/debian/patches/10_gcc-check.patch
index 28acd6b..3cc7b79 100644
--- a/debian/patches/10_gcc-check.patch
+++ b/debian/patches/10_gcc-check.patch
@@ -1,22 +1,27 @@
-Description: Relax compiler check
-Author: Matthias Klose <doko at debian.org>
-Acked-By: Anton Gladky <gladk at debian.org>
+Description: Remove the gcc version check
+Author: Adrian Bunk <bunk at debian.org>
 Bug-Debian: https://bugs.debian.org/811210
-Last-Update: 2016-01-16
+Bug-Debian: https://bugs.debian.org/853324
 
-Index: mpich/src/binding/cxx/mpicxx.h.in
-===================================================================
---- mpich.orig/src/binding/cxx/mpicxx.h.in
-+++ mpich/src/binding/cxx/mpicxx.h.in
-@@ -17,10 +17,8 @@
- // 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__ 
+--- mpich-3.2.orig/src/binding/cxx/mpicxx.h.in
++++ mpich-3.2/src/binding/cxx/mpicxx.h.in
+@@ -12,18 +12,6 @@
+ #error "You cannot define MPI; that name is reserved for the MPI namespace"
+ #endif
+ 
+-// Check for incompatible GCC versions
+-// GCC (specifically) g++ changed the calling convention
+-// 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_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2 
-+# if __GNUC__ > @GNUCXX_VERSION@ 
- #  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
+-#  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
 -#  endif
- # endif     
- #endif
- 
+-# endif     
+-#endif
+-
+ /* 
+  * Because the API is defined, some methods have parameters that are 
+  * not used.  The following definition allows us to suppress warnings
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpich.git