svn commit: r541285 - head/net/mpich2/files
Tobias Kortkamp
tobik at FreeBSD.org
Sun Jul 5 15:02:18 UTC 2020
Author: tobik
Date: Sun Jul 5 15:02:17 2020
New Revision: 541285
URL: https://svnweb.freebsd.org/changeset/ports/541285
Log:
net/mpich2: Unbreak build with GCC 10
checking whether gfortran10 allows mismatched arguments... no
configure: error: The Fortran compiler gfortran10 will not compile files that call
the same routine with arguments of different types.
http://package18.nyi.freebsd.org/data/121amd64-default-PR244494/2020-06-10_18h04m44s/logs/errors/mpich2-1.5_14,5.log
PR: 246700
Added:
head/net/mpich2/files/patch-test_mpi_configure (contents, props changed)
Modified:
head/net/mpich2/files/patch-configure
Modified: head/net/mpich2/files/patch-configure
==============================================================================
--- head/net/mpich2/files/patch-configure Sun Jul 5 14:55:49 2020 (r541284)
+++ head/net/mpich2/files/patch-configure Sun Jul 5 15:02:17 2020 (r541285)
@@ -1,6 +1,35 @@
---- configure.orig 2009-11-18 17:40:48.000000000 +0100
-+++ configure 2009-11-24 21:26:56.000000000 +0100
-@@ -40383,12 +40383,12 @@
+--- configure.orig 2012-10-08 19:02:38 UTC
++++ configure
+@@ -31361,7 +31361,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+ # The best solution is to turn off errors on particular routines
+ # if that isn't possible (e.g., too many of them), then
+ # just try arguments that turn off all checking
+- for flags in "-mismatch" ; do
++ for flags in "-fallow-argument-mismatch" "-mismatch" ; do
+ testok=no
+ FFLAGS="$FFLAGS $flags"
+ cat > conftest.$ac_ext <<_ACEOF
+@@ -31403,18 +31403,8 @@ the same routine with arguments of different types." "
+ fi
+
+ addarg=$pac_cv_prog_f77_mismatched_args_parm
++FFLAGS="$FFLAGS $addarg"
+
+- if test "X$addarg" != "X" ; then
+- # We could add the names of all of the MPI routines that
+- # accept different types. Instead, we fail cleanly.
+- # Some Fortran compilers allow you to turn off checking for
+- # mismatched arguments for *all* routines. Adding an argument
+- # that turns off checking for *everything* is not something that
+- # configure should do - if the user wants this, they can follow
+- # the instructions in the following error message.
+- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5
+- fi
+-
+ bindings="$bindings f77"
+ bindings_dirs="$bindings_dirs src/binding/f77"
+
+@@ -43769,12 +43759,12 @@ return thr_create ();
return 0;
}
_ACEOF
@@ -14,5 +43,5 @@
+ ac_res=$ac_lib
+ LIBS="$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_thr_create=$ac_res
Added: head/net/mpich2/files/patch-test_mpi_configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich2/files/patch-test_mpi_configure Sun Jul 5 15:02:17 2020 (r541285)
@@ -0,0 +1,30 @@
+--- test/mpi/configure.orig 2012-10-08 19:02:24 UTC
++++ test/mpi/configure
+@@ -9835,7 +9835,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+ # The best solution is to turn off errors on particular routines
+ # if that isn't possible (e.g., too many of them), then
+ # just try arguments that turn off all checking
+- for flags in "-mismatch" ; do
++ for flags in "-fallow-argument-mismatch" "-mismatch" ; do
+ testok=no
+ FFLAGS="$FFLAGS $flags"
+ cat > conftest.$ac_ext <<_ACEOF
+@@ -9877,17 +9877,7 @@ the same routine with arguments of different types." "
+ fi
+
+ addarg=$pac_cv_prog_f77_mismatched_args_parm
+-
+- if test "X$addarg" != "X" ; then
+- # We could add the names of all of the MPI routines that
+- # accept different types. Instead, we fail cleanly.
+- # Some Fortran compilers allow you to turn off checking for
+- # mismatched arguments for *all* routines. Adding an argument
+- # that turns off checking for *everything* is not something that
+- # configure should do - if the user wants this, they can follow
+- # the instructions in the following error message.
+- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5
+- fi
++FFLAGS="$FFLAGS $addarg"
+
+ # Check whether we need -lU77 to get iargc and getarg, which
+ # are used for a few of the tests in spawn (U77 was needed with
More information about the svn-ports-all
mailing list