RFA: Fix detecting of in-tree MPFR 3.1.0 sources

[Richard Guenther]

On Wed, May 9, 2012 at 2:52 PM, Nick Clifton <nickc@redhat.com> wrote:
> Hi Guys,
>
>    http://www.mpfr.org/mpfr-current/#changes
>
>  The current release of the MPFR library (v3.1.0) has reorganized its
>  sources such the mpfr.h header file is now in a sub-directory called
>  'src', rather than being at the top level.  This has broken GCC's use
>  of in-tree MPFR sources.
>
>  I am asking for permission to apply the patch below to fix the
>  problem.  I tested it by building an i686-pc-linux-gnu toolchain on a
>  machine with no MPFR libraries installed, but with a copy of the mpfr
>  3.1.0 sources installed in-tree.  I also built a second toolchain with
>  an in-tree copy of the mpfr 2.4.2 sources, just to make sure that the
>  old paths still worked.  Both builds worked.
>
>  OK to apply ?

I think we only support dropping in exactly the versions we provide
in infrastructure/ - which matches the version we require in install.texi.

Or did that change?

> Cheers
>  Nick
>
> gcc/ChangeLog
> 2012-05-09  Nick Clifton  <nickc@redhat.com>
>
>        * configure.ac (mpfr-dir): When using in-tree MPFR sources
>        allow for the fact that from release v3.1.0 of MPFR the source
>        files were moved into a src sub-directory.
>        * configure: Regenerate.
>
> Index: configure.ac
> ===================================================================
> --- configure.ac        (revision 187320)
> +++ configure.ac        (working copy)
> @@ -1289,9 +1289,16 @@
>   gmplibs="-L$with_mpfr_lib $gmplibs"
>  fi
>  if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
> -  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
> -  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
> -  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
> +  # MPFR v3.1.0 moved the sources into a src sub-directory.
> +  if test -d ${srcdir}/mpfr/src; then
> +    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
> +    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
> +    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
> +  else
> +    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
> +    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
> +    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
> +  fi
>   # Do not test the mpfr version.  Assume that it is sufficient, since
>   # it is in the source tree, and the library has not been built yet
>   # but it would be included on the link line in the version check below