This patch updates the GCC prerequisite documenation and error message
code in gcc 4.2 to reflect using mpfr-2.2.1.
The 4.2 branch never actually forces any particular version of mpfr, it
merely notes when you have a "buggy" version and tells you about it when
you configure GCC.
If you're missing mpfr *entirely*, and request fortran to be built, then
it'll give you an error message. But it does that already. I simply
update which version of mpfr that it recommends in this case.
Tested on sparc-sun-solaris2.10, and installed as obvious.
--Kaveh
2006-12-02 Kaveh R. Ghazi <[EMAIL PROTECTED]>
* configure.in: Check for MPFR 2.2.1. Update error message.
* configure: Regenerate.
gcc:
* doc/install.texi: Update MPFR prerequisite to version 2.2.1.
diff -rup orig/egcc-4.2-SVN20061201/configure.in
egcc-4.2-SVN20061201/configure.in
--- orig/egcc-4.2-SVN20061201/configure.in 2006-11-26 20:09:39.000000000
-0500
+++ egcc-4.2-SVN20061201/configure.in 2006-12-02 12:14:14.812824146 -0500
@@ -1115,7 +1115,7 @@ if test x"$have_gmp" = xyes; then
AC_MSG_CHECKING([for correct version of mpfr.h])
AC_TRY_COMPILE([#include "gmp.h"
#include <mpfr.h>],[
-#if MPFR_VERSION_MAJOR < 2 || (MPFR_VERSION_MAJOR == 2 && MPFR_VERSION_MINOR <
2)
+#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
choke me
#endif
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy version of MPFR detected])])
@@ -1267,7 +1267,7 @@ if test -d ${srcdir}/gcc; then
case ,${enable_languages},:${have_gmp}:${need_gmp} in
*,${language},*:no:yes)
# Specifically requested language; tell them.
- AC_MSG_ERROR([GMP 4.1 and MPFR 2.2 or newer versions required by
$language])
+ AC_MSG_ERROR([GMP 4.1 and MPFR 2.2.1 or newer versions required by
$language])
;;
*:no:yes)
# Silently disable.
diff -rup orig/egcc-4.2-SVN20061201/gcc/doc/install.texi
egcc-4.2-SVN20061201/gcc/doc/install.texi
--- orig/egcc-4.2-SVN20061201/gcc/doc/install.texi 2006-11-26
20:09:18.000000000 -0500
+++ egcc-4.2-SVN20061201/gcc/doc/install.texi 2006-12-02 12:12:36.697248650
-0500
@@ -297,14 +297,14 @@ installed in your library search path, y
the @option{--with-gmp} configure option. See also
@option{--with-gmp-lib} and @option{--with-gmp-include}.
[EMAIL PROTECTED] MPFR Library version 2.2 (or later)
[EMAIL PROTECTED] MPFR Library version 2.2.1 (or later)
Necessary to build the Fortran frontend. It can be downloaded from
@uref{http://www.mpfr.org/}. The version of MPFR that is bundled with
GMP 4.1.x contains numerous bugs. Although GNU Fortran will appear
to function with the buggy versions of MPFR, there are a few GNU Fortran
bugs that will not be fixed when using this version. It is strongly
-recommended to upgrade to at least MPFR version 2.2.
+recommended to upgrade to the recommended version of MPFR.
The @option{--with-mpfr} configure option should be used if your MPFR
Library is not installed in your default library search path. See
