Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2885
Modified Files:
build_toolchain.sh
Log Message:
* New mpfr version.
* Break out version handling a bit to simplify updates to newer
versions.
Index: build_toolchain.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/build_toolchain.sh,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- build_toolchain.sh 10 Aug 2007 22:39:40 -0000 1.69
+++ build_toolchain.sh 30 Aug 2007 14:10:28 -0000 1.70
@@ -59,6 +59,8 @@
# Default target (if it's not given on command line)
#
TARGET="vax-linux-uclibc"
+GMP_VERSION="4.2.1"
+MPFR_VERSION="2.3.0"
function current_utc_time() {
date -u '+%Y%m%d-%H%M%S-UTC'
@@ -515,17 +517,17 @@
[ "${DO_PATCHES_LINUX}" -ne 0 ] && execute try_patches.sh "linux" "${LINUX_SRC}" "${VAX_PATCHES_PATH}"
#
-# Get libmpfr/libgmp
+# Get libgmp/libmpfr
#
pushd "${GCC_SRC}"
- execute wget -q http://www.mpfr.org/mpfr-current/mpfr-2.2.1.tar.gz
- execute wget -q -O mpfr.patch http://www.mpfr.org/mpfr-current/patches
- execute tar xzf mpfr-2.2.1.tar.gz
- (cd mpfr-2.2.1 && execute patch -p1 < ../mpfr.patch)
+ execute wget -q "ftp://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.bz2"
+ execute tar xjf "gmp-${GMP_VERSION}.tar.bz2"
+ (cd "gmp-${GMP_VERSION}" && execute patch -p1 < "${VAX_PATCHES_PATH}/gmp.patch")
- execute wget -q ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.1.tar.bz2
- execute tar xjf gmp-4.2.1.tar.bz2
- (cd gmp-4.2.1 && execute patch -p1 < "${VAX_PATCHES_PATH}/gmp.patch")
+ execute wget -q "http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.gz"
+ execute wget -q -O mpfr.patch http://www.mpfr.org/mpfr-current/patches || true
+ execute tar xzf "mpfr-${MPFR_VERSION}.tar.gz"
+ (cd "mpfr-${MPFR_VERSION}" && execute patch -p1 < ../mpfr.patch) || true
popd
@@ -771,16 +773,17 @@
# Build gcc to run on the target system
#
pushd "${GCC1_NATIVE_BUILD}"
- pushd "${GCC_SRC}/gmp-4.2.1"
+ pushd "${GCC_SRC}/gmp-${GMP_VERSION}"
+ NONE_TARGET="none-`echo "${TARGET}" | cut -f 2- -d -`"
CC="${TARGET}-gcc" LDFLAGS=-static CFLAGS=-static \
execute ./configure \
- --host="${TARGET}" \
+ --host="${NONE_TARGET}" \
--prefix="${INSTALL_BASE}/usr"
execute make
execute make install
execute make install prefix="${INSTALL_NATIVE_BASE}/usr"
popd
- pushd "${GCC_SRC}/mpfr-2.2.1"
+ pushd "${GCC_SRC}/mpfr-${MPFR_VERSION}"
CC="${TARGET}-gcc" LDFLAGS=-static CFLAGS=-static \
execute ./configure \
--host="${TARGET}" \
|
