1.1 --- a/scripts/build/libc/newlib.sh Sun Apr 11 23:05:48 2010 +0200
1.2 +++ b/scripts/build/libc/newlib.sh Sun Apr 11 23:17:25 2010 +0200
1.3 @@ -5,11 +5,11 @@
1.4 # Edited by Martin Lund <mgl@doredevelopment.dk>
1.5 #
1.6
1.7 -libc_newlib_basename() {
1.8 +libc_newlib_version() {
1.9 if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
1.10 - echo "newlib-${CT_LIBC_VERSION}"
1.11 + echo "${CT_LIBC_VERSION}"
1.12 else
1.13 - echo "newlib-cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
1.14 + echo "cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
1.15 fi
1.16 }
1.17
1.18 @@ -20,11 +20,11 @@
1.19 if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
1.20 CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
1.21 else
1.22 - CT_GetCVS "$(libc_newlib_basename)" \
1.23 + CT_GetCVS "newlib-$(libc_newlib_version)" \
1.24 ":pserver:anoncvs@sources.redhat.com:/cvs/src" \
1.25 "newlib" \
1.26 "${CT_LIBC_VERSION}" \
1.27 - "$(libc_newlib_basename)=src"
1.28 + "newlib-$(libc_newlib_version)=src"
1.29 fi
1.30
1.31 if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
1.32 @@ -33,8 +33,8 @@
1.33 }
1.34
1.35 do_libc_extract() {
1.36 - CT_Extract "$(libc_newlib_basename)"
1.37 - CT_Patch "$(libc_newlib_basename)"
1.38 + CT_Extract "newlib-$(libc_newlib_version)"
1.39 + CT_Patch "newlib-$(libc_newlib_version)"
1.40
1.41 if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
1.42 CT_Extract "avr32headers"
1.43 @@ -71,7 +71,7 @@
1.44 AR=${CT_TARGET}-ar \
1.45 RANLIB=${CT_TARGET}-ranlib \
1.46 CT_DoExecLog ALL \
1.47 - "${CT_SRC_DIR}/$(libc_newlib_basename)/configure" \
1.48 + "${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \
1.49 --host=${CT_BUILD} \
1.50 --target=${CT_TARGET} \
1.51 --prefix=${CT_PREFIX_DIR}