47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
|
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
|