Get rid of CT_GMP_FILE and CT_MPFR_FILE.
/trunk/scripts/build/gmp.sh | 32 16 16 0 ++++++++++++++++----------------
/trunk/scripts/build/mpfr.sh | 38 19 19 0 +++++++++++++++++++-------------------
/trunk/scripts/crosstool.sh | 2 0 2 0 --
3 files changed, 35 insertions(+), 37 deletions(-)
1.1 --- a/scripts/build/gmp.sh Sun Jan 04 14:25:24 2009 +0000
1.2 +++ b/scripts/build/gmp.sh Sun Jan 04 14:25:58 2009 +0000
1.3 @@ -12,12 +12,12 @@
1.4
1.5 # Download GMP
1.6 do_gmp_get() {
1.7 - CT_GetFile "${CT_GMP_FILE}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
1.8 + CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
1.9 }
1.10
1.11 # Extract GMP
1.12 do_gmp_extract() {
1.13 - CT_ExtractAndPatch "${CT_GMP_FILE}"
1.14 + CT_ExtractAndPatch "gmp-${CT_GMP_VERSION}"
1.15 }
1.16
1.17 do_gmp() {
1.18 @@ -27,13 +27,13 @@
1.19 CT_DoStep INFO "Installing GMP"
1.20
1.21 CT_DoLog EXTRA "Configuring GMP"
1.22 - CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.23 - CT_DoExecLog ALL \
1.24 - "${CT_SRC_DIR}/${CT_GMP_FILE}/configure" \
1.25 - --build=${CT_BUILD} \
1.26 - --host=${CT_HOST} \
1.27 - --prefix="${CT_PREFIX_DIR}" \
1.28 - --disable-shared --enable-static \
1.29 + CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.30 + CT_DoExecLog ALL \
1.31 + "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
1.32 + --build=${CT_BUILD} \
1.33 + --host=${CT_HOST} \
1.34 + --prefix="${CT_PREFIX_DIR}" \
1.35 + --disable-shared --enable-static \
1.36 --enable-fft --enable-mpbsd
1.37
1.38 CT_DoLog EXTRA "Building GMP"
1.39 @@ -59,13 +59,13 @@
1.40 CT_DoStep INFO "Installing GMP for the target"
1.41
1.42 CT_DoLog EXTRA "Configuring GMP"
1.43 - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
1.44 - CT_DoExecLog ALL \
1.45 - "${CT_SRC_DIR}/${CT_GMP_FILE}/configure" \
1.46 - --build=${CT_BUILD} \
1.47 - --host=${CT_TARGET} \
1.48 - --prefix=/usr \
1.49 - --disable-shared --enable-static \
1.50 + CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
1.51 + CT_DoExecLog ALL \
1.52 + "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
1.53 + --build=${CT_BUILD} \
1.54 + --host=${CT_TARGET} \
1.55 + --prefix=/usr \
1.56 + --disable-shared --enable-static \
1.57 --enable-fft --enable-mpbsd
1.58
1.59 CT_DoLog EXTRA "Building GMP"
2.1 --- a/scripts/build/mpfr.sh Sun Jan 04 14:25:24 2009 +0000
2.2 +++ b/scripts/build/mpfr.sh Sun Jan 04 14:25:58 2009 +0000
2.3 @@ -12,13 +12,13 @@
2.4
2.5 # Download MPFR
2.6 do_mpfr_get() {
2.7 - CT_GetFile "${CT_MPFR_FILE}" http://www.mpfr.org/mpfr-current/ \
2.8 + CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/ \
2.9 http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
2.10 }
2.11
2.12 # Extract MPFR
2.13 do_mpfr_extract() {
2.14 - CT_ExtractAndPatch "${CT_MPFR_FILE}"
2.15 + CT_ExtractAndPatch "mpfr-${CT_MPFR_VERSION}"
2.16
2.17 # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
2.18 # same version number. Unfortunately, some tarballs of MPFR are not
2.19 @@ -27,7 +27,7 @@
2.20 # and: http://sourceware.org/ml/crossgcc/2008-06/msg00005.html
2.21 # This hack is not bad per se, but the MPFR guys would be better not to
2.22 # do that in the future...
2.23 - CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}"
2.24 + CT_Pushd "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}"
2.25 if [ ! -f .autotools.ct-ng ]; then
2.26 CT_DoLog DEBUG "Re-building autotools files"
2.27 CT_DoExecLog ALL autoreconf -fi
2.28 @@ -56,14 +56,14 @@
2.29 CT_DoStep INFO "Installing MPFR"
2.30
2.31 CT_DoLog EXTRA "Configuring MPFR"
2.32 - CFLAGS="${CT_CFLAGS_FOR_HOST}" \
2.33 - CT_DoExecLog ALL \
2.34 - "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \
2.35 - --build=${CT_BUILD} \
2.36 - --host=${CT_HOST} \
2.37 - --prefix="${CT_PREFIX_DIR}" \
2.38 - --enable-thread-safe \
2.39 - --disable-shared --enable-static \
2.40 + CFLAGS="${CT_CFLAGS_FOR_HOST}" \
2.41 + CT_DoExecLog ALL \
2.42 + "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
2.43 + --build=${CT_BUILD} \
2.44 + --host=${CT_HOST} \
2.45 + --prefix="${CT_PREFIX_DIR}" \
2.46 + --enable-thread-safe \
2.47 + --disable-shared --enable-static \
2.48 --with-gmp="${CT_PREFIX_DIR}"
2.49
2.50 CT_DoLog EXTRA "Building MPFR"
2.51 @@ -89,14 +89,14 @@
2.52 CT_DoStep INFO "Installing MPFR for the target"
2.53
2.54 CT_DoLog EXTRA "Configuring MPFR"
2.55 - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
2.56 - CT_DoExecLog ALL \
2.57 - "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \
2.58 - --build=${CT_BUILD} \
2.59 - --host=${CT_TARGET} \
2.60 - --prefix=/usr \
2.61 - --enable-thread-safe \
2.62 - --disable-shared --enable-static \
2.63 + CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
2.64 + CT_DoExecLog ALL \
2.65 + "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
2.66 + --build=${CT_BUILD} \
2.67 + --host=${CT_TARGET} \
2.68 + --prefix=/usr \
2.69 + --enable-thread-safe \
2.70 + --disable-shared --enable-static \
2.71 --with-gmp="${CT_SYSROOT_DIR}/usr"
2.72
2.73 CT_DoLog EXTRA "Building MPFR"
3.1 --- a/scripts/crosstool.sh Sun Jan 04 14:25:24 2009 +0000
3.2 +++ b/scripts/crosstool.sh Sun Jan 04 14:25:58 2009 +0000
3.3 @@ -85,8 +85,6 @@
3.4 CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
3.5
3.6 # Now, build up the variables from the user-configured options.
3.7 -CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
3.8 -CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
3.9 CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
3.10 CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"
3.11