1.1 --- a/scripts/build/libc/newlib.sh	Thu Oct 11 14:39:45 2012 +1000
     1.2 +++ b/scripts/build/libc/newlib.sh	Thu Jan 10 00:27:13 2013 +0100
     1.3 @@ -5,14 +5,6 @@
     1.4  # Edited by Martin Lund <mgl@doredevelopment.dk>
     1.5  #
     1.6  
     1.7 -libc_newlib_version() {
     1.8 -    if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
     1.9 -        echo "${CT_LIBC_VERSION}"
    1.10 -    else
    1.11 -        echo "cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
    1.12 -    fi
    1.13 -}
    1.14 -
    1.15  do_libc_get() {
    1.16      local libc_src
    1.17      local avr32headers_src
    1.18 @@ -23,15 +15,9 @@
    1.19      if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then
    1.20          CT_GetCustom "newlib" "${CT_LIBC_VERSION}"      \
    1.21                       "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}"
    1.22 -    elif [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
    1.23 +    else # ! custom location
    1.24          CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
    1.25 -    else
    1.26 -        CT_GetCVS "newlib-$(libc_newlib_version)"                   \
    1.27 -                  ":pserver:anoncvs@sources.redhat.com:/cvs/src"    \
    1.28 -                  "newlib"                                          \
    1.29 -                  "${CT_LIBC_VERSION}"                              \
    1.30 -                  "newlib-$(libc_newlib_version)=src"
    1.31 -    fi
    1.32 +    fi # ! custom location
    1.33  
    1.34      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.35          CT_GetFile "avr32headers" ${avr32headers_src}
    1.36 @@ -40,13 +26,13 @@
    1.37  
    1.38  do_libc_extract() {
    1.39      # If using custom directory location, nothing to do
    1.40 -    if [    "${CT_LIBC_NEWLIB_CUSTOM}" != "y"                \
    1.41 -         -a -d "${CT_SRC_DIR}/newlib-$(libc_newlib_version)" ]; then
    1.42 +    if [    "${CT_LIBC_NEWLIB_CUSTOM}" != "y"            \
    1.43 +         -a -d "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}" ]; then
    1.44          return 0
    1.45      fi
    1.46  
    1.47 -    CT_Extract "newlib-$(libc_newlib_version)"
    1.48 -    CT_Patch "newlib" "$(libc_newlib_version)"
    1.49 +    CT_Extract "newlib-${CT_LIBC_VERSION}"
    1.50 +    CT_Patch "newlib" "${CT_LIBC_VERSION}"
    1.51  
    1.52      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.53          CT_Extract "avr32headers"
    1.54 @@ -110,7 +96,7 @@
    1.55      CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}"             \
    1.56      AR=${CT_TARGET}-ar                                  \
    1.57      RANLIB=${CT_TARGET}-ranlib                          \
    1.58 -    "${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \
    1.59 +    "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
    1.60          --host=${CT_BUILD}                              \
    1.61          --target=${CT_TARGET}                           \
    1.62          --prefix=${CT_PREFIX_DIR}                       \