1.1 --- a/scripts/build/libc/newlib.sh Mon Oct 26 23:20:33 2009 +0100
1.2 +++ b/scripts/build/libc/newlib.sh Sun Jan 31 12:27:55 2010 +0100
1.3 @@ -5,12 +5,27 @@
1.4 # Edited by Martin Lund <mgl@doredevelopment.dk>
1.5 #
1.6
1.7 +libc_newlib_basename() {
1.8 + if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
1.9 + echo "newlib-${CT_LIBC_VERSION}"
1.10 + else
1.11 + echo "newlib-cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
1.12 + fi
1.13 +}
1.14
1.15 do_libc_get() {
1.16 libc_src="ftp://sources.redhat.com/pub/newlib"
1.17 avr32headers_src="http://dev.doredevelopment.dk/avr32-toolchain/sources"
1.18 -
1.19 - CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
1.20 +
1.21 + if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
1.22 + CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
1.23 + else
1.24 + CT_GetCVS "$(libc_newlib_basename)" \
1.25 + ":pserver:anoncvs@sources.redhat.com:/cvs/src" \
1.26 + "newlib" \
1.27 + "${CT_LIBC_VERSION}" \
1.28 + "$(libc_newlib_basename)=src"
1.29 + fi
1.30
1.31 if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
1.32 CT_GetFile "avr32headers" ${avr32headers_src}
1.33 @@ -18,8 +33,8 @@
1.34 }
1.35
1.36 do_libc_extract() {
1.37 - CT_Extract "newlib-${CT_LIBC_VERSION}"
1.38 - CT_Patch "newlib-${CT_LIBC_VERSION}"
1.39 + CT_Extract "$(libc_newlib_basename)"
1.40 + CT_Patch "$(libc_newlib_basename)"
1.41
1.42 if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
1.43 CT_Extract "avr32headers"
1.44 @@ -51,14 +66,14 @@
1.45 # build : not used
1.46 # host : the machine building newlib
1.47 # target : the machine newlib runs on
1.48 - CC_FOR_BUILD="${CT_BUILD}-gcc" \
1.49 - CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS} -O" \
1.50 - AR=${CT_TARGET}-ar \
1.51 - RANLIB=${CT_TARGET}-ranlib \
1.52 - CT_DoExecLog ALL \
1.53 - "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
1.54 - --host=${CT_BUILD} \
1.55 - --target=${CT_TARGET} \
1.56 + CC_FOR_BUILD="${CT_BUILD}-gcc" \
1.57 + CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS} -O" \
1.58 + AR=${CT_TARGET}-ar \
1.59 + RANLIB=${CT_TARGET}-ranlib \
1.60 + CT_DoExecLog ALL \
1.61 + "${CT_SRC_DIR}/$(libc_newlib_basename)/configure" \
1.62 + --host=${CT_BUILD} \
1.63 + --target=${CT_TARGET} \
1.64 --prefix=${CT_PREFIX_DIR}
1.65
1.66 CT_DoLog EXTRA "Building C library"