From: Ralf Wildenhues Date: Mon, 24 Mar 2008 10:44:36 +0000 (+0100) Subject: Fix Fortran testsuite failures with gfortran 4.3. X-Git-Tag: v2.62~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3a1f226962226fcec8d74419dfe2d11e585149;p=thirdparty%2Fautoconf.git Fix Fortran testsuite failures with gfortran 4.3. * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): When scanning verbose compiler output, skip lines that set variables; gfortran 4.3 sets LIBRARY_PATH, COMPILER_PATH, COLLECT_GCC_OPTIONS. * THANKS: Update. Report by Vincent Lefèvre. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 4e1cf7447..fc99ae61c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-24 Ralf Wildenhues + + Fix Fortran testsuite failures with gfortran 4.3. + * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): When scanning + verbose compiler output, skip lines that set variables; gfortran + 4.3 sets LIBRARY_PATH, COMPILER_PATH, COLLECT_GCC_OPTIONS. + * THANKS: Update. + Report by Vincent Lefèvre. + 2008-03-21 Eric Blake * GNUmakefile: Resynchronize with gnulib. diff --git a/THANKS b/THANKS index a561cfbb8..1227291a8 100644 --- a/THANKS +++ b/THANKS @@ -334,6 +334,7 @@ Uwe Seimet us@orbacus.com Vance Shipley vances@motivity.ca Viktor Dukhovni viktor@anaheim.esm.com Ville Karaila karaila@iki.fi +Vincent Lefèvre vincent@vinc17.org Vincent Torri vtorri at univ-evry.fr Vladimir Volovich vvv@vsu.ru Volker Borchert bt@teknon.de @@ -355,7 +356,7 @@ mode: text coding: utf-8 End: -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index fa476b332..96ce4b85e 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -1,6 +1,6 @@ # This file is part of Autoconf. -*- Autoconf -*- # Fortran languages support. -# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify @@ -549,7 +549,10 @@ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS m4_default([$1], [$ac_cv_prog_ eval "set x $ac_link" shift _AS_ECHO_LOG([$[*]]) -ac_[]_AC_LANG_ABBREV[]_v_output=`eval $ac_link AS_MESSAGE_LOG_FD>&1 2>&1 | grep -v 'Driving:'` +# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, +# LIBRARY_PATH; skip all such settings. +ac_[]_AC_LANG_ABBREV[]_v_output=`eval $ac_link AS_MESSAGE_LOG_FD>&1 2>&1 | + grep -v 'Driving:' | grep -v "^[[_$as_cr_Letters]][[_$as_cr_alnum]]*="` AS_ECHO(["$ac_[]_AC_LANG_ABBREV[]_v_output"]) >&AS_MESSAGE_LOG_FD _AC_LANG_PREFIX[]FLAGS=$ac_save_FFLAGS