1.1 --- a/scripts/build/libc/newlib.sh	Sun Mar 03 13:10:51 2013 -0500
     1.2 +++ b/scripts/build/libc/newlib.sh	Sun Mar 31 04:07:38 2013 +0000
     1.3 @@ -6,11 +6,10 @@
     1.4  #
     1.5  
     1.6  do_libc_get() {
     1.7 -    local libc_src
     1.8 -    local avr32headers_src
     1.9 -
    1.10 -    libc_src="ftp://sourceware.org/pub/newlib"
    1.11 -    avr32headers_src="http://dev.doredevelopment.dk/avr32-toolchain/sources"
    1.12 +    local libc_src="ftp://sourceware.org/pub/newlib"
    1.13 +    local avr32headers_src="http://www.atmel.com/Images"
    1.14 +          avr32headers_base="avr-headers-3.2.3.970"    # used below
    1.15 +    local avr32headers_ext=".zip"
    1.16  
    1.17      if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then
    1.18          CT_GetCustom "newlib" "${CT_LIBC_VERSION}"      \
    1.19 @@ -20,7 +19,7 @@
    1.20      fi # ! custom location
    1.21  
    1.22      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.23 -        CT_GetFile "avr32headers" ${avr32headers_src}
    1.24 +        CT_GetFile ${avr32headers_base} ${avr32headers_ext} ${avr32headers_src}
    1.25      fi
    1.26  }
    1.27  
    1.28 @@ -35,7 +34,9 @@
    1.29      CT_Patch "newlib" "${CT_LIBC_VERSION}"
    1.30  
    1.31      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.32 -        CT_Extract "avr32headers"
    1.33 +        # The avr32header zip file extracts to avr32/*.h
    1.34 +        # Put that in its directory, the same as normal tarballs
    1.35 +        CT_Extract ${avr32headers_base} -d ${CT_SRC_DIR}/${avr32headers_base}
    1.36      fi
    1.37  }
    1.38  
    1.39 @@ -49,8 +50,8 @@
    1.40  
    1.41          CT_DoLog EXTRA "Installing Atmel's AVR32 headers"
    1.42          CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/${CT_TARGET}/include"
    1.43 -        CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/avr32headers"     \
    1.44 -                               "${CT_PREFIX_DIR}/${CT_TARGET}/include/avr32"
    1.45 +        CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${avr32headers_base}/avr32"     \
    1.46 +                               "${CT_PREFIX_DIR}/${CT_TARGET}/include/"
    1.47  
    1.48          CT_EndStep
    1.49      fi