libc/newlib: fix variables for avr32 headers
author"Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Dec 31 12:55:21 2013 +0100 (2013-12-31)
changeset 3259cff2f2d39e91
parent 3258 b966620c7b1e
child 3260 f43e37c7c047
libc/newlib: fix variables for avr32 headers

Some of the avr32headers related variables are used in different
functions, so have to be declared globally, not locally.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
scripts/build/libc/newlib.sh
     1.1 --- a/scripts/build/libc/newlib.sh	Tue Dec 31 12:25:27 2013 +0100
     1.2 +++ b/scripts/build/libc/newlib.sh	Tue Dec 31 12:55:21 2013 +0100
     1.3 @@ -5,11 +5,12 @@
     1.4  # Edited by Martin Lund <mgl@doredevelopment.dk>
     1.5  #
     1.6  
     1.7 +LIBC_NEWLIB_AVR_HDRS_URI="http://www.atmel.com/Images"
     1.8 +LIBC_NEWLIB_AVR_HDRS_BASE="avr-headers-3.2.3.970"
     1.9 +LIBC_NEWLIB_AVR_HDRS_EXT=".zip"
    1.10 +
    1.11  do_libc_get() {
    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 +21,9 @@
    1.20      fi # ! custom location
    1.21  
    1.22      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.23 -        CT_GetFile ${avr32headers_base} ${avr32headers_ext} ${avr32headers_src}
    1.24 +        CT_GetFile ${LIBC_NEWLIB_AVR_HDRS_BASE} \
    1.25 +                   ${LIBC_NEWLIB_AVR_HDRS_EXT}  \
    1.26 +                   ${LIBC_NEWLIB_AVR_HDRS_URI}
    1.27      fi
    1.28  }
    1.29  
    1.30 @@ -37,7 +40,8 @@
    1.31      if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
    1.32          # The avr32header zip file extracts to avr32/*.h
    1.33          # Put that in its directory, the same as normal tarballs
    1.34 -        CT_Extract ${avr32headers_base} -d ${CT_SRC_DIR}/${avr32headers_base}
    1.35 +        CT_Extract ${LIBC_NEWLIB_AVR_HDRS_BASE}     \
    1.36 +                   -d ${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE}
    1.37      fi
    1.38  }
    1.39  
    1.40 @@ -51,7 +55,7 @@
    1.41  
    1.42          CT_DoLog EXTRA "Installing Atmel's AVR32 headers"
    1.43          CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/${CT_TARGET}/include"
    1.44 -        CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${avr32headers_base}/avr32"     \
    1.45 +        CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE}/avr32"   \
    1.46                                 "${CT_PREFIX_DIR}/${CT_TARGET}/include/"
    1.47  
    1.48          CT_EndStep