GMP and MPFR are no longer a sub-component of gcc (config-wise).

Build and install GMP and MPFR for the target.
Use the target GMP and MPFR to build the native gdb.
Have separate extra_config for cross gdb, native gdb and gdbserver.
Check native GMP and MPFR in //.

 /trunk/scripts/build/debug/300-gdb.sh |   27    19     8     0 ++++++++++++++++-------
 /trunk/scripts/build/gmp.sh           |   47    39     8     0 ++++++++++++++++++++++++++++++++-------
 /trunk/scripts/build/mpfr.sh          |   49    40     9     0 +++++++++++++++++++++++++++++++++--------
 /trunk/steps.mk                       |    2     2     0     0 ++
 /trunk/config/cc/gcc.in               |   18     1    17     0 +--------------
 /trunk/config/debug/gdb.in            |    6     1     5     0 +----
 /trunk/config/config.in               |    1     1     0     0 +
 /trunk/config/gmp_mpfr.in             |   34    34     0     0 ++++++++++++++++++++++++++++
 8 files changed, 137 insertions(+), 47 deletions(-)

1 files changed, 40 insertions, 9 deletions

diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh
index 2df6a38..d03b1d6 100644
--- a/scripts/build/mpfr.sh
+++ b/scripts/build/mpfr.sh
@@ -2,10 +2,17 @@
 # Copyright 2008 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
-if [ "${CT_CC_GCC_GMP_MPFR}" = "y" ]; then
+do_print_filename() { :; }
+do_mpfr_get() { :; }
+do_mpfr_extract() { :; }
+do_mpfr() { :; }
+do_mpfr_target() { :; }
+
+# Overide function depending on configuration
+if [ "${CT_GMP_MPFR}" = "y" ]; then
 
 do_print_filename() {
-    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] || return 0
+    [ "${CT_GMP_MPFR}" = "y" ] || return 0
     echo "mpfr-${CT_MPFR_VERSION}"
 }
 
@@ -57,7 +64,7 @@ do_mpfr() {
 
     if [ "${CT_MPFR_CHECK}" = "y" ]; then
         CT_DoLog EXTRA "Checking MPFR"
-        make -s check       2>&1 |CT_DoLog ALL
+        make ${PARALLELMFLAGS} -s check 2>&1 |CT_DoLog ALL
     fi
 
     CT_DoLog EXTRA "Installing MPFR"
@@ -66,11 +73,35 @@ do_mpfr() {
     CT_EndStep
 }
 
-else # No MPFR
+if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then
 
-do_print_filename() { :; }
-do_mpfr_get() { :; }
-do_mpfr_extract() { :; }
-do_mpfr() { :; }
+do_mpfr_target() {
+    mkdir -p "${CT_BUILD_DIR}/build-mpfr-target"
+    cd "${CT_BUILD_DIR}/build-mpfr-target"
+
+    CT_DoStep INFO "Installing MPFR for the target"
+
+    CT_DoLog EXTRA "Configuring MPFR"
+    CFLAGS="${CT_CFLAGS_FOR_TARGET}"                        \
+    "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure"               \
+        --build=${CT_BUILD}                                 \
+        --host=${CT_TARGET}                                 \
+        --prefix=/usr                                       \
+        --enable-thread-safe                                \
+        --disable-shared --enable-static                    \
+        --with-gmp="${CT_SYSROOT_DIR}/usr"                  2>&1 |CT_DoLog ALL
+
+    CT_DoLog EXTRA "Building MPFR"
+    make ${PARALLELMFLAGS}  2>&1 |CT_DoLog ALL
+
+    # Not possible to check MPFR while X-compiling
+
+    CT_DoLog EXTRA "Installing MPFR"
+    make DESTDIR="${CT_SYSROOT_DIR}" install    2>&1 |CT_DoLog ALL
+
+    CT_EndStep
+}
+
+fi # CT_GMP_MPFR_TARGET == y
 
-fi
+fi # CT_GMP_MPFR == y