Use CT_DoExecLog for MPFR build.

/trunk/scripts/build/mpfr.sh |   48    25    23     0 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)
This commit is contained in:
Yann E. MORIN" 2008-07-14 15:15:40 +00:00
parent f235889bde
commit dd5a5f683e

View File

@ -36,8 +36,8 @@ do_mpfr_extract() {
CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}" CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}"
if [ ! -f .autotools.ct-ng ]; then if [ ! -f .autotools.ct-ng ]; then
CT_DoLog EXTRA "Re-building autotools files" CT_DoLog EXTRA "Re-building autotools files"
autoreconf -fi 2>&1 |CT_DoLog ALL CT_DoExecLog ALL autoreconf -fi
libtoolize -f 2>&1 |CT_DoLog ALL CT_DoExecLog ALL libtoolize -f
touch .autotools.ct-ng touch .autotools.ct-ng
fi fi
CT_Popd CT_Popd
@ -51,24 +51,25 @@ do_mpfr() {
CT_DoLog EXTRA "Configuring MPFR" CT_DoLog EXTRA "Configuring MPFR"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \ "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_HOST} \ --host=${CT_HOST} \
--prefix="${CT_PREFIX_DIR}" \ --prefix="${CT_PREFIX_DIR}" \
--enable-thread-safe \ --enable-thread-safe \
--disable-shared --enable-static \ --disable-shared --enable-static \
--with-gmp="${CT_PREFIX_DIR}" 2>&1 |CT_DoLog ALL --with-gmp="${CT_PREFIX_DIR}"
CT_DoLog EXTRA "Building MPFR" CT_DoLog EXTRA "Building MPFR"
make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_MPFR_CHECK}" = "y" ]; then if [ "${CT_MPFR_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking MPFR" CT_DoLog EXTRA "Checking MPFR"
make ${PARALLELMFLAGS} -s check 2>&1 |CT_DoLog ALL CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi fi
CT_DoLog EXTRA "Installing MPFR" CT_DoLog EXTRA "Installing MPFR"
make install 2>&1 |CT_DoLog ALL CT_DoExecLog ALL make install
CT_EndStep CT_EndStep
} }
@ -83,21 +84,22 @@ do_mpfr_target() {
CT_DoLog EXTRA "Configuring MPFR" CT_DoLog EXTRA "Configuring MPFR"
CFLAGS="${CT_CFLAGS_FOR_TARGET}" \ CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \ "${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_TARGET} \ --host=${CT_TARGET} \
--prefix=/usr \ --prefix=/usr \
--enable-thread-safe \ --enable-thread-safe \
--disable-shared --enable-static \ --disable-shared --enable-static \
--with-gmp="${CT_SYSROOT_DIR}/usr" 2>&1 |CT_DoLog ALL --with-gmp="${CT_SYSROOT_DIR}/usr"
CT_DoLog EXTRA "Building MPFR" CT_DoLog EXTRA "Building MPFR"
make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL CT_DoExecLog ALL make ${PARALLELMFLAGS}
# Not possible to check MPFR while X-compiling # Not possible to check MPFR while X-compiling
CT_DoLog EXTRA "Installing MPFR" CT_DoLog EXTRA "Installing MPFR"
make DESTDIR="${CT_SYSROOT_DIR}" install 2>&1 |CT_DoLog ALL CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
CT_EndStep CT_EndStep
} }