1.1 --- a/config/libc/newlib.in	Thu Oct 11 14:39:45 2012 +1000
     1.2 +++ b/config/libc/newlib.in	Tue Oct 30 22:40:48 2012 +0100
     1.3 @@ -36,22 +36,6 @@
     1.4      bool
     1.5      prompt "1.17.0"
     1.6  
     1.7 -config LIBC_NEWLIB_CVS
     1.8 -    bool
     1.9 -    prompt "Use CVS snapshot"
    1.10 -    depends on CONFIGURE_has_cvs
    1.11 -    help
    1.12 -      The newlib "team" rolls new releases about once a year (december).
    1.13 -      This is quite a long time between releases, in case code was fixed.
    1.14 -      
    1.15 -      Saying 'Y' here will allow you to use the bleeding-edge code from
    1.16 -      the CVS repository. This may or may not fix your issues, may or may
    1.17 -      not build, may or may not crash your machine, may or may not withdraw
    1.18 -      money from your bank account, may or may not date your girlfriend,
    1.19 -      may or may not resurect Elvis... :-)
    1.20 -      
    1.21 -      In a word: use the CVS snapshot at your own risk! 
    1.22 -
    1.23  config LIBC_NEWLIB_CUSTOM
    1.24      bool
    1.25      prompt "Custom newlib"
    1.26 @@ -73,7 +57,6 @@
    1.27  
    1.28  config LIBC_VERSION
    1.29      string
    1.30 -    prompt "use CVS tag" if LIBC_NEWLIB_CVS
    1.31  # Don't remove next line
    1.32  # CT_INSERT_VERSION_STRING_BELOW
    1.33      default "1.20.0" if LIBC_NEWLIB_V_1_20_0

     2.1 --- a/scripts/build/libc/newlib.sh	Thu Oct 11 14:39:45 2012 +1000
     2.2 +++ b/scripts/build/libc/newlib.sh	Tue Oct 30 22:40:48 2012 +0100
     2.3 @@ -5,14 +5,6 @@
     2.4  # Edited by Martin Lund <mgl@doredevelopment.dk>
     2.5  #
     2.6  
     2.7 -libc_newlib_version() {
     2.8 -    if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
     2.9 -        echo "${CT_LIBC_VERSION}"
    2.10 -    else
    2.11 -        echo "cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
    2.12 -    fi
    2.13 -}
    2.14 -
    2.15  do_libc_get() {
    2.16      local libc_src
    2.17      local avr32headers_src
    2.18 @@ -23,15 +15,9 @@
    2.19      if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then
    2.20          CT_GetCustom "newlib" "${CT_LIBC_VERSION}"      \
    2.21                       "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}"
    2.22 -    elif [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
    2.23 +    else # ! custom location
    2.24          CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
    2.25 -    else
    2.26 -        CT_GetCVS "newlib-$(libc_newlib_version)"                   \
    2.27 -                  ":pserver:anoncvs@sources.redhat.com:/cvs/src"    \
    2.28 -                  "newlib"                                          \
    2.29 -                  "${CT_LIBC_VERSION}"                              \
    2.30 -                  "newlib-$(libc_newlib_version)=src"
    2.31 -    fi
    2.32 +    fi # ! custom location
    2.33  
    2.34      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    2.35          CT_GetFile "avr32headers" ${avr32headers_src}
    2.36 @@ -40,13 +26,13 @@
    2.37  
    2.38  do_libc_extract() {
    2.39      # If using custom directory location, nothing to do
    2.40 -    if [    "${CT_LIBC_NEWLIB_CUSTOM}" != "y"                \
    2.41 -         -a -d "${CT_SRC_DIR}/newlib-$(libc_newlib_version)" ]; then
    2.42 +    if [    "${CT_LIBC_NEWLIB_CUSTOM}" != "y"            \
    2.43 +         -a -d "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}" ]; then
    2.44          return 0
    2.45      fi
    2.46  
    2.47 -    CT_Extract "newlib-$(libc_newlib_version)"
    2.48 -    CT_Patch "newlib" "$(libc_newlib_version)"
    2.49 +    CT_Extract "newlib-${CT_LIBC_VERSION}"
    2.50 +    CT_Patch "newlib" "${CT_LIBC_VERSION}"
    2.51  
    2.52      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    2.53          CT_Extract "avr32headers"
    2.54 @@ -110,7 +96,7 @@
    2.55      CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}"             \
    2.56      AR=${CT_TARGET}-ar                                  \
    2.57      RANLIB=${CT_TARGET}-ranlib                          \
    2.58 -    "${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \
    2.59 +    "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
    2.60          --host=${CT_BUILD}                              \
    2.61          --target=${CT_TARGET}                           \
    2.62          --prefix=${CT_PREFIX_DIR}                       \