mirror of
https://github.com/fail0verflow/bootmii-utils.git
synced 2025-01-10 01:19:21 +01:00
68 lines
3.4 KiB
Diff
68 lines
3.4 KiB
Diff
From 37ca432506c69627cd91cc76717a1304bfaccabb Mon Sep 17 00:00:00 2001
|
|
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
Date: Wed, 9 May 2012 16:20:17 +0000
|
|
Subject: [PATCH] PR bootstrap/50461
|
|
* 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.
|
|
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187341 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
---
|
|
ChangeLog | 9 +++++++++
|
|
configure | 13 ++++++++++---
|
|
configure.ac | 13 ++++++++++---
|
|
3 files changed, 29 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index faabb33..083f2ce 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5204,9 +5204,16 @@ if test "x$with_mpfr_lib" != x; then
|
|
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
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 0159f5e..378e9f5 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1289,9 +1289,16 @@ if test "x$with_mpfr_lib" != x; then
|
|
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
|
|
--
|
|
1.7.3.4
|
|
|