diff options
| -rw-r--r-- | config/libc/newlib.in | 17 | ||||
| -rw-r--r-- | scripts/build/libc/newlib.sh | 28 |
2 files changed, 7 insertions, 38 deletions
diff --git a/config/libc/newlib.in b/config/libc/newlib.in index 16ac247..8350fba 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -36,22 +36,6 @@ config LIBC_NEWLIB_V_1_17_0 bool prompt "1.17.0" -config LIBC_NEWLIB_CVS - bool - prompt "Use CVS snapshot" - depends on CONFIGURE_has_cvs - help - The newlib "team" rolls new releases about once a year (december). - This is quite a long time between releases, in case code was fixed. - - Saying 'Y' here will allow you to use the bleeding-edge code from - the CVS repository. This may or may not fix your issues, may or may - not build, may or may not crash your machine, may or may not withdraw - money from your bank account, may or may not date your girlfriend, - may or may not resurect Elvis... :-) - - In a word: use the CVS snapshot at your own risk! - config LIBC_NEWLIB_CUSTOM bool prompt "Custom newlib" @@ -73,7 +57,6 @@ endif # LIBC_NEWLIB_CUSTOM config LIBC_VERSION string - prompt "use CVS tag" if LIBC_NEWLIB_CVS # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "1.20.0" if LIBC_NEWLIB_V_1_20_0 diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 3e91631..a1d15bf 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -5,14 +5,6 @@ # Edited by Martin Lund <mgl@doredevelopment.dk> # -libc_newlib_version() { - if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then - echo "${CT_LIBC_VERSION}" - else - echo "cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}" - fi -} - do_libc_get() { local libc_src local avr32headers_src @@ -23,15 +15,9 @@ do_libc_get() { if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then CT_GetCustom "newlib" "${CT_LIBC_VERSION}" \ "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}" - elif [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then + else # ! custom location CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src} - else - CT_GetCVS "newlib-$(libc_newlib_version)" \ - ":pserver:anoncvs@sources.redhat.com:/cvs/src" \ - "newlib" \ - "${CT_LIBC_VERSION}" \ - "newlib-$(libc_newlib_version)=src" - fi + fi # ! custom location if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then CT_GetFile "avr32headers" ${avr32headers_src} @@ -40,13 +26,13 @@ do_libc_get() { do_libc_extract() { # If using custom directory location, nothing to do - if [ "${CT_LIBC_NEWLIB_CUSTOM}" != "y" \ - -a -d "${CT_SRC_DIR}/newlib-$(libc_newlib_version)" ]; then + if [ "${CT_LIBC_NEWLIB_CUSTOM}" != "y" \ + -a -d "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}" ]; then return 0 fi - CT_Extract "newlib-$(libc_newlib_version)" - CT_Patch "newlib" "$(libc_newlib_version)" + CT_Extract "newlib-${CT_LIBC_VERSION}" + CT_Patch "newlib" "${CT_LIBC_VERSION}" if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then CT_Extract "avr32headers" @@ -110,7 +96,7 @@ do_libc() { CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ AR=${CT_TARGET}-ar \ RANLIB=${CT_TARGET}-ranlib \ - "${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \ + "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \ --host=${CT_BUILD} \ --target=${CT_TARGET} \ --prefix=${CT_PREFIX_DIR} \ |