Accepting request 687143 from home:anag:branches:science:HPC

- Add patch to remove obsolete GCC check (bnc#1129421). It also patches
  autogen.sh to get the autotools working in SLE12SP4.
  * 0001-Drop-GCC-check.patch
- Force to re-run autotools to generate properly the files after 
  patching src/binding/cxx/buildiface

OBS-URL: https://build.opensuse.org/request/show/687143
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=54

0001-Drop-GCC-check.patch

@@ -0,0 +1,46 @@
+diff -Nrua autogen.sh autogen.sh
+--- autogen.sh
++++ autogen.sh
+@@ -516,7 +516,7 @@
+ 
+ echo_n "Checking for automake version... "
+ recreate_tmp
+-ver=1.15
++ver=1.13
+ cat > .tmp/configure.ac<<EOF
+ AC_INIT(testver,1.0)
+ AC_CONFIG_AUX_DIR([m4])
+@@ -554,7 +554,7 @@
+ 
+ echo_n "Checking for libtool version... "
+ recreate_tmp
+-ver=2.4.3
++ver=2.4.2
+ cat <<EOF >.tmp/configure.ac
+ AC_INIT(testver,1.0)
+ AC_CONFIG_AUX_DIR([m4])
+diff -Nrua src/binding/cxx/buildiface src/binding/cxx/buildiface
+--- src/binding/cxx/buildiface
++++ src/binding/cxx/buildiface
+@@ -1454,21 +1454,6 @@
+ #endif\n\n";
+     }
+ 
+-    # GCC changed the calling convention between 3.2.3 and 3.4.3 (!!!)
+-    # check for that
+-    print $OUTFD "
+-// 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 
+-#  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
+-#  endif
+-# endif     
+-#endif\n";
+-
+     print $OUTFD "
+ /* 
+  * Because the API is defined, some methods have parameters that are 

mvapich2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 20 19:01:00 UTC 2019 - Ana Guerrero Lopez <aguerrero@suse.com>
+
+- Add patch to remove obsolete GCC check (bnc#1129421). It also patches
+  autogen.sh to get the autotools working in SLE12SP4.
+  * 0001-Drop-GCC-check.patch
+- Force to re-run autotools to generate properly the files after 
+  patching src/binding/cxx/buildiface 
+
 -------------------------------------------------------------------
 Sun Nov 18 14:21:27 UTC 2018 - eich@suse.com
 

mvapich2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mvapich2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -164,6 +164,9 @@ Source3:        macros.hpc-mvapich2
 Source100:      _multibuild
 Patch0:         mvapich2-s390_get_cycles.patch
 Patch2:         mvapich2-arm-support.patch
+# PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
+# It's been merged upstream, should be removed with the next release
+Patch3:         0001-Drop-GCC-check.patch
 Url:            http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -293,10 +296,11 @@ is based on MPICH2 and MVICH. This package contains the static libraries
 %setup -q -n mvapich2-%{version}%{?rc_ver}
 %patch0
 %patch2
+%patch3
 cp /usr/share/automake*/config.* .
 
 %build
-#./autogen.sh
+PERL_USE_UNSAFE_INC=1 ./autogen.sh
 %if %{with hpc}
 %{hpc_setup}
 %{hpc_configure} \